This PR is meant to add an ACA container built from Rocky 9 specifically meant for System Tests in the CI. It also follows up on PR 748 to make minor additions to suit the new ACA containers, plus some improved comments and one renamed file.
The following files have been added/modified:
Dockerfile.aca-rocky-ci is the Dockerfile used to create an image for the ACA built from Rocky 9, specifically to be used with the CI System Tests. It differs from Dockerfile.aca-rocky by NOT using a CMD statement at the end of the Dockerfile (it is now commented out) to start the ACA; instead, the ACA scripts are called from run_system_tests.sh. However, if the user wanted to use the CMD statement and use the container for other purposes, they can uncomment it at the end of the file as specified by the commented instructions. Also, this image has already been pushed to the nsacyber/HIRS GitHub package registry as ghcr.io/nsacyber/hirs/aca-rocky-ci:latest.
Dockerfile.tpm2provisioner_dotnet (old name) has been renamed to Dockerfile.tpm2provisioner-dotnet-ci (new name) to have a consistent naming convention, as with Dockerfile.aca-rocky-ci. Also added some more comments to guide any users who want to build/run the container locally.
run_system_tests.sh now calls for the execution of scripts to set up and start the ACA within the container pulled from ghcr.io/nsacyber/hirs/aca-rocky-ci:latest. It also checks out the current branch being pushed within the container's HIRS clone before starting the ACA. To confirm the branch for both the ACA and Provisioner, it will echo the current branch name within the HIRS cloned repo inside the containers, which will be output to the GitHub Action run (see lines 20 and 27 of run_system_tests.sh).
docker-compose-system-test.yml now pulls the new ghcr.io/nsacyber/hirs/aca-rocky-ci:latest image.
system_test.yml now has updated Action uses (v3 -> v4), removing a warning that was there previously.
To perform the test in GitHub actions:
On this branch in remote repository, use a workflow dispatch by going: Actions > HIRS System Tests > Run workflow.
This PR is meant to add an ACA container built from Rocky 9 specifically meant for System Tests in the CI. It also follows up on PR 748 to make minor additions to suit the new ACA containers, plus some improved comments and one renamed file.
The following files have been added/modified:
Dockerfile.aca-rocky-ciis the Dockerfile used to create an image for the ACA built from Rocky 9, specifically to be used with the CI System Tests. It differs fromDockerfile.aca-rockyby NOT using a CMD statement at the end of the Dockerfile (it is now commented out) to start the ACA; instead, the ACA scripts are called fromrun_system_tests.sh. However, if the user wanted to use the CMD statement and use the container for other purposes, they can uncomment it at the end of the file as specified by the commented instructions. Also, this image has already been pushed to the nsacyber/HIRS GitHub package registry asghcr.io/nsacyber/hirs/aca-rocky-ci:latest.Dockerfile.tpm2provisioner_dotnet(old name) has been renamed toDockerfile.tpm2provisioner-dotnet-ci(new name) to have a consistent naming convention, as withDockerfile.aca-rocky-ci. Also added some more comments to guide any users who want to build/run the container locally.run_system_tests.shnow calls for the execution of scripts to set up and start the ACA within the container pulled fromghcr.io/nsacyber/hirs/aca-rocky-ci:latest. It also checks out the current branch being pushed within the container's HIRS clone before starting the ACA. To confirm the branch for both the ACA and Provisioner, it will echo the current branch name within the HIRS cloned repo inside the containers, which will be output to the GitHub Action run (see lines 20 and 27 ofrun_system_tests.sh).docker-compose-system-test.ymlnow pulls the newghcr.io/nsacyber/hirs/aca-rocky-ci:latestimage.system_test.ymlnow has updated Action uses (v3 -> v4), removing a warning that was there previously.To perform the test in GitHub actions:
On this branch in remote repository, use a workflow dispatch by going: Actions > HIRS System Tests > Run workflow.