Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn off application tests CI #16

Closed
wants to merge 3 commits into from
Closed

Turn off application tests CI #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96a8387
- init
nshyrei Oct 2, 2024
bcbdc7e
- added comment
nshyrei Oct 3, 2024
af3ad67
- code review changes
nshyrei Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions .github/workflows/build-solution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ on:
required: true
PAT:
required: true
on:
pull_request_review:
types: [ submitted, edited ]
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: Personally I'm in strong favor of a one-goal-one-PR rule. It makes it much more clear why these changes are there. I agree to what you're trying to do, but doesn't that mean we can also disable the other keys here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't fully understand what keys are you talking about here, do you want to remove the push/pull rules? I believe in that case CI won't start.


env:
CARGO_TERM_COLOR: always
Expand All @@ -26,7 +27,7 @@ jobs:
build:

runs-on: ubuntu-20.04
if: github.event_name == 'pull_request' && github.event.review.state == 'approved'

steps:
- name: Pull main repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -72,12 +73,6 @@ jobs:
# Download the latest release of docker-credential-ecr-login
aws s3 cp s3://fortanix-internal-artifact-repository/other-packages/docker-credential-ecr-login .

# Make it executable
chmod +x docker-credential-ecr-login

# Move it to a directory in the PATH
sudo mv docker-credential-ecr-login /usr/local/bin/

- name: Build Rust code
run: |
./build-converter.sh
Expand All @@ -89,13 +84,14 @@ jobs:
run: |
./unit-test-solution.sh

- name: Build application tests container
run: |
./build-app-tests-container.sh

- name: Run application tests container
env:
FORTANIX_API_KEY: ${{ secrets.FORTANIX_API_KEY }}
OVERLAYFS_UNIT_TEST_API_KEY: ${{ secrets.OVERLAYFS_UNIT_TEST_API_KEY }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now these keys are no longer required, right? Can you also remove them from the secrets section above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are still used in

salmiac/.github/workflows/build-solution.yml

Line 80 in af3ad67

- name: Run Rust unit tests

run: |
./run-application-tests.sh ${{ env.TESTS_CONTAINER_ECR }} ${{ env.FORTANIX_API_KEY }}
# Will be uncommented in RTE-188
# - name: Build application tests container
nshyrei marked this conversation as resolved.
Show resolved Hide resolved
# run: |
# ./build-app-tests-container.sh

# - name: Run application tests container
# env:
# FORTANIX_API_KEY: ${{ secrets.FORTANIX_API_KEY }}
# OVERLAYFS_UNIT_TEST_API_KEY: ${{ secrets.OVERLAYFS_UNIT_TEST_API_KEY }}
# run: |
# ./run-application-tests.sh ${{ env.TESTS_CONTAINER_ECR }} ${{ env.FORTANIX_API_KEY }}
2 changes: 1 addition & 1 deletion make/salmiac-tests-container.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ $(TESTS-CONTAINER): $(TESTS-STAGE-CONTENTS)

$(TESTS-CONTAINER-APP-TESTS-FILE):: | $(dir $(TESTS-CONTAINER-APP-TESTS-FILE))

$(eval $(call make-cp-rule,/usr/local/bin/$(DOCKER-AWS-HELPER),$(TESTS-STAGE-DIR)/$(DOCKER-AWS-HELPER)))
$(eval $(call make-cp-rule,/usr/bin/$(DOCKER-AWS-HELPER),$(TESTS-STAGE-DIR)/$(DOCKER-AWS-HELPER)))
Loading