Skip to content

Commit 6c0f9d7

Browse files
authored
Merge branch 'main' into feature/high-frequency-gpu-metrics
2 parents 69ba416 + 637837b commit 6c0f9d7

File tree

118 files changed

+6098
-1019
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+6098
-1019
lines changed

.github/workflows/PR-test.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,27 @@ jobs:
213213
github_sha: ${{ github.sha }}
214214
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
215215

216+
IntegrationTestGate:
217+
name: Check ready for testing label
218+
runs-on: ubuntu-latest
219+
steps:
220+
- name: Check for ready for testing label
221+
run: |
222+
if [[ "${{ github.event.pull_request.draft }}" == "true" ]]; then
223+
echo "Draft PR - skipping label check."
224+
exit 0
225+
fi
226+
227+
if [[ "${{ contains(github.event.pull_request.labels.*.name, 'ready for testing') }}" != "true" ]]; then
228+
echo "Missing 'ready for testing' label. Please add before merging."
229+
exit 1
230+
fi
231+
232+
echo "'ready for testing' label found!"
233+
216234
verify-all:
217235
name: Verify All PR Test Jobs
218-
needs: [CheckLabel, BuildAndUpload, OutputEnvVariables, StartLocalStack,
236+
needs: [IntegrationTestGate, CheckLabel, BuildAndUpload, OutputEnvVariables, StartLocalStack,
219237
GenerateTestMatrix, EC2LinuxIntegrationTest, EC2SELinuxIntegrationTest,
220238
StopLocalStack]
221239
runs-on: ubuntu-latest
@@ -249,4 +267,4 @@ jobs:
249267
exit 1
250268
fi
251269
252-
echo -e "\nAll required jobs completed without failures!"
270+
echo -e "\nAll required jobs completed without failures!"

.github/workflows/build-test-artifacts.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@ on:
2323
description: "Run Test on the new container image"
2424
default: true
2525
type: boolean
26+
build-distributor:
27+
description: "Whether to build an SSM distributor"
28+
default: false
29+
type: boolean
2630
workflow_call:
2731
inputs:
2832
test-image-before-upload:
2933
description: "Run Test on the new container image"
3034
default: true
3135
type: boolean
36+
build-distributor:
37+
description: "Whether to build an SSM distributor"
38+
default: false
39+
type: boolean
3240

3341
concurrency:
3442
group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -72,6 +80,20 @@ jobs:
7280
BucketKey: "integration-test/binary/${{ github.sha }}"
7381
PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
7482

83+
BuildDistributor:
84+
needs: [BuildAndUpload, BuildAndUploadPackages, BuildDocker]
85+
uses: ./.github/workflows/test-build-distributor.yml
86+
secrets: inherit
87+
permissions:
88+
id-token: write
89+
contents: read
90+
with:
91+
BucketKey: "integration-test/binary/${{ github.sha }}"
92+
PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
93+
TerraformAWSAssumeRole: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
94+
Bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
95+
DistributorName: ${{ vars.SSM_TEST_DISTRIBUTOR_NAME }}
96+
7597
BuildAndUploadITAR:
7698
uses: ./.github/workflows/test-build.yml
7799
secrets: inherit

0 commit comments

Comments
 (0)