Skip to content

Commit 651f5f2

Browse files
authored
Add onprem test back (#1962)
1 parent 5901e9b commit 651f5f2

2 files changed

Lines changed: 27 additions & 0 deletions

File tree

.github/workflows/ec2-integration-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ on:
4040
type: string
4141
is_selinux_test:
4242
type: boolean
43+
is_onprem_test:
44+
type: boolean
4345
s3_integration_bucket:
4446
type: string
4547
secrets:
@@ -123,6 +125,7 @@ jobs:
123125
-var="ssh_key_value=${{env.PRIVATE_KEY}}" \
124126
-var="test_dir=${{ matrix.arrays.test_dir }}" \
125127
-var="test_name=${{ matrix.arrays.os }}" \
128+
-var="is_onprem=${{ inputs.is_onprem_test }}" \
126129
-var="user=${{ matrix.arrays.username }}"; then
127130
terraform destroy -var="region=${{ inputs.region }}" -var="ami=${{ matrix.arrays.ami }}" -auto-approve
128131
else

.github/workflows/test-artifacts.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
outputs:
132132
ec2_gpu_matrix: ${{ steps.set-matrix.outputs.ec2_gpu_matrix }}
133133
ec2_linux_matrix: ${{ steps.set-matrix.outputs.ec2_linux_matrix }}
134+
ec2_linux_onprem_matrix: ${{ steps.set-matrix.outputs.ec2_linux_onprem_matrix }}
134135
ec2_selinux_matrix: ${{ steps.set-matrix.outputs.ec2_selinux_matrix }}
135136
ec2_windows_matrix: ${{ steps.set-matrix.outputs.ec2_windows_matrix }}
136137
ec2_mac_matrix: ${{ steps.set-matrix.outputs.ec2_mac_matrix }}
@@ -163,6 +164,7 @@ jobs:
163164
echo "ec2_gpu_matrix=$(echo $(cat generator/resources/ec2_gpu_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
164165
echo "eks_addon_matrix=$(echo $(cat generator/resources/eks_addon_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
165166
echo "ec2_linux_matrix=$(echo $(cat generator/resources/ec2_linux_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
167+
echo "ec2_linux_onprem_matrix=$(echo $(cat generator/resources/ec2_linux_onprem_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
166168
echo "ec2_selinux_matrix=$(echo $(cat generator/resources/ec2_selinux_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
167169
echo "ec2_windows_matrix=$(echo $(cat generator/resources/ec2_windows_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
168170
echo "ec2_mac_matrix=$(echo $(cat generator/resources/ec2_mac_complete_test_matrix.json))" >> "$GITHUB_OUTPUT"
@@ -182,6 +184,7 @@ jobs:
182184
echo "ec2_gpu_matrix: ${{ steps.set-matrix.outputs.ec2_gpu_matrix }}"
183185
echo "eks_addon_matrix: ${{ steps.set-matrix.outputs.eks_addon_matrix }}"
184186
echo "ec2_linux_matrix: ${{ steps.set-matrix.outputs.ec2_linux_matrix }}"
187+
echo "ec2_linux_onprem_matrix: ${{ steps.set-matrix.outputs.ec2_linux_onprem_matrix }}"
185188
echo "ec2_selinux_matrix: ${{ steps.set-matrix.outputs.ec2_selinux_matrix }}"
186189
echo "ec2_windows_matrix: ${{ steps.set-matrix.outputs.ec2_windows_matrix }}"
187190
echo "ec2_mac_matrix: ${{ steps.set-matrix.outputs.ec2_mac_matrix }}"
@@ -435,6 +438,27 @@ jobs:
435438
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
436439
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
437440
is_selinux_test: false
441+
is_onprem_test: false
442+
secrets: inherit
443+
444+
LinuxOnPremIntegrationTest:
445+
needs: [GenerateTestMatrix, OutputEnvVariables]
446+
name: 'OnpremLinux'
447+
uses: ./.github/workflows/ec2-integration-test.yml
448+
with:
449+
build_id: ${{ inputs.build_id }}
450+
test_dir: terraform/ec2/linux
451+
job_id: linux-onprem-integration-test
452+
test_props: ${{needs.GenerateTestMatrix.outputs.ec2_linux_onprem_matrix}}
453+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
454+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
455+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
456+
localstack_host: ${{needs.StartLocalStack.outputs.local_stack_host_name}}
457+
region: us-west-2
458+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
459+
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
460+
is_selinux_test: false
461+
is_onprem_test: true
438462
secrets: inherit
439463

440464

0 commit comments

Comments
 (0)