@@ -29,41 +29,51 @@ jobs:
2929 permissions :
3030 id-token : write
3131 contents : read
32+ strategy :
33+ matrix :
34+ image :
35+ - name : " "
36+ dockerfile : core/plugin.Dockerfile
37+ tag-suffix : " "
38+ - name : (plugins)
39+ dockerfile : plugins/plugin.Dockerfile
40+ tag-suffix : -plugins
3241 steps :
3342 - name : Collect Metrics
3443 if : always()
3544 id : collect-gha-metrics
36- uses : goplugin/push-gha-metrics-action@808c183d1f5c26a4f3fd50b75d3cf7b58d9aa293
45+ uses : goplugin/push-gha-metrics-action@90fcbaac8ebf86da9c4d55dba24f6fe3029f0e0b
3746 with :
3847 basic-auth : ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
3948 hostname : ${{ secrets.GRAFANA_CLOUD_HOST }}
4049 this-job-name : Build Custom CL Image
4150 continue-on-error : true
4251 - name : Check if image exists
4352 id : check-image
44- uses : goplugin/plugin-github-actions/docker/image-exists@8489879838862929f43f7d7cd1b33903965cf507 # v2.1.6
53+ uses : goplugin/plugin-github-actions/docker/image-exists@2c9f401149f6c25fb632067b7e6626aebeee5d69 # v2.1.6
4554 with :
4655 repository : plugin
47- tag : starknet.${{ github.sha }}
56+ tag : starknet.${{ github.sha }}${{ matrix.image.tag-suffix }}
4857 AWS_REGION : ${{ secrets.QA_AWS_REGION }}
4958 AWS_ROLE_TO_ASSUME : ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
50- - name : Build Image
59+ - name : Build Image ${{ matrix.image.name }}
5160 if : steps.check-image.outputs.exists == 'false'
5261 # note using a temporary commit for build-image that works around the go get issues, replace when go get issues are fixed please
53- uses : goplugin/plugin-github-actions/plugin-testing-framework/build-image@a2bf54158aa0a77a55f432347bc9ecf8ef642c2b # cosmos_one_off
62+ uses : goplugin/plugin-github-actions/plugin-testing-framework/build-image@2c9f401149f6c25fb632067b7e6626aebeee5d69
5463 with :
5564 cl_repo : goplugin/pluginv3.0
5665 cl_ref : ${{ github.event.inputs.cl_branch_ref }}
66+ cl_dockerfile : ${{ matrix.image.dockerfile }}
5767 # commit of the caller branch
5868 dep_starknet_sha : ${{ github.event.pull_request.head.sha || github.sha }}
59- push_tag : ${{ env.CL_ECR }}:starknet.${{ github.sha }}
69+ push_tag : ${{ env.CL_ECR }}:starknet.${{ github.sha }}${{ matrix.image.tag-suffix }}
6070 QA_AWS_REGION : ${{ secrets.QA_AWS_REGION }}
6171 QA_AWS_ROLE_TO_ASSUME : ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
6272 QA_PRIVATE_GHA_PULL : ${{ secrets.QA_PRIVATE_GHA_PULL }}
6373 - name : Print Plugin Image Built
6474 run : |
6575 echo "### plugin image tag used for this test run :link:" >> $GITHUB_STEP_SUMMARY
66- echo "\`starknet.${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
76+ echo "\`starknet.${{ github.sha }}${{ matrix.image.tag-suffix }} \`" >> $GITHUB_STEP_SUMMARY
6777
6878 build_test_image :
6979 environment : integration
@@ -97,13 +107,23 @@ jobs:
97107 runs-on : ubuntu20.04-16cores-64GB
98108 needs : [ build_custom_plugin_image, build_test_image ]
99109 environment : integration
110+ # these values need to match those used to build the plugin image
111+ strategy :
112+ matrix :
113+ image :
114+ - name : " "
115+ tag-suffix : " "
116+ - name : (plugins)
117+ tag-suffix : -plugins
100118 env :
101119 TEST_SUITE : smoke
102120 TEST_ARGS : -test.timeout 1h
103121 PRIVATE_KEY : ${{ secrets.GOERLI_PRIVATE_KEY }}
104122 ACCOUNT : ${{ secrets.GOERLI_ACCOUNT }}
105- TTL : 1h
123+ TTL : 3h
124+ TEST_DURATION : 15m
106125 NODE_COUNT : 5
126+ INTERNAL_DOCKER_REPO : ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
107127 permissions :
108128 checks : write
109129 pull-requests : write
@@ -113,25 +133,25 @@ jobs:
113133 - name : Collect Metrics
114134 if : always()
115135 id : collect-gha-metrics
116- uses : goplugin/push-gha-metrics-action@808c183d1f5c26a4f3fd50b75d3cf7b58d9aa293
136+ uses : goplugin/push-gha-metrics-action@8163dcea2f01a0a8fec84b284406ff7af1d2e1c0
117137 with :
118138 basic-auth : ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
119139 hostname : ${{ secrets.GRAFANA_CLOUD_HOST }}
120- this-job-name : Run Smoke Tests
140+ this-job-name : Run Smoke Tests ${{ matrix.image.name }}
121141 continue-on-error : true
122142 - name : Checkout the repo
123143 uses : actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
124144 - name : Install Nix
125145 uses : cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20
126146 with :
127147 nix_path : nixpkgs=channel:nixos-unstable
128- - name : Run Tests
129- uses : goplugin/plugin-github-actions/plugin-testing-framework/run-tests@8489879838862929f43f7d7cd1b33903965cf507 # v2.1.6
148+ - name : Run Tests ${{ matrix.image.name }}
149+ uses : goplugin/plugin-github-actions/plugin-testing-framework/run-tests@2c9f401149f6c25fb632067b7e6626aebeee5d69
130150 with :
131151 test_command_to_run : nix develop -c make test-integration-smoke-ci
132152 test_download_vendor_packages_command : cd integration-tests && nix develop -c go mod download
133153 cl_repo : ${{ env.CL_ECR }}
134- cl_image_tag : starknet.${{ github.sha }}
154+ cl_image_tag : starknet.${{ github.sha }}${{ matrix.image.tag-suffix }}
135155 token : ${{ secrets.GITHUB_TOKEN }}
136156 go_mod_path : ./integration-tests/go.mod
137157 QA_AWS_REGION : ${{ secrets.QA_AWS_REGION }}
0 commit comments