From e8f3fdf472a3d18e7e0c6926f9afd332f224e756 Mon Sep 17 00:00:00 2001 From: sk593 Date: Thu, 23 Jan 2025 09:47:34 -0800 Subject: [PATCH 1/8] restore bicep artifacts before starting tests Signed-off-by: sk593 --- .github/workflows/functional-test-cloud.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml index a15b0c6e22..0ad73b408c 100644 --- a/.github/workflows/functional-test-cloud.yaml +++ b/.github/workflows/functional-test-cloud.yaml @@ -714,6 +714,12 @@ jobs: } } EOF + - name: Restore Bicep artifacts before running functional tests + run: | + # Restore Radius Bicep types + bicep build ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep + # Restore AWS Bicep types + bicep build ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep - name: Run functional tests run: | # Ensure rad cli is in path before running tests. From d0533fdf70e1e0874c69d9e0980005270c6413a5 Mon Sep 17 00:00:00 2001 From: sk593 Date: Thu, 23 Jan 2025 15:42:30 -0800 Subject: [PATCH 2/8] testing Signed-off-by: sk593 --- .github/workflows/functional-test-noncloud.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index 4587555765..3938a0c7c0 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -317,7 +317,12 @@ jobs: } } EOF - + - name: Restore Bicep artifacts before running functional tests + run: | + # Restore Radius Bicep types + bicep build ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep + # Restore AWS Bicep types + bicep build ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep - name: Publish Bicep Test Recipes run: | export PATH=$GITHUB_WORKSPACE/bin:$PATH From b04c3e76df8e53f7b08d7aa0442cedcf3db4dc9a Mon Sep 17 00:00:00 2001 From: sk593 Date: Thu, 23 Jan 2025 15:50:31 -0800 Subject: [PATCH 3/8] revert Signed-off-by: sk593 --- .github/workflows/functional-test-noncloud.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index 3938a0c7c0..25344b04b3 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -317,12 +317,7 @@ jobs: } } EOF - - name: Restore Bicep artifacts before running functional tests - run: | - # Restore Radius Bicep types - bicep build ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep - # Restore AWS Bicep types - bicep build ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep + - name: Publish Bicep Test Recipes run: | export PATH=$GITHUB_WORKSPACE/bin:$PATH From c8123fee55b52e8f3d6bbcbc86eeab36bceb5a46 Mon Sep 17 00:00:00 2001 From: sk593 Date: Thu, 23 Jan 2025 15:51:03 -0800 Subject: [PATCH 4/8] nit Signed-off-by: sk593 --- .github/workflows/functional-test-noncloud.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index 25344b04b3..4587555765 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -317,7 +317,7 @@ jobs: } } EOF - + - name: Publish Bicep Test Recipes run: | export PATH=$GITHUB_WORKSPACE/bin:$PATH From 7654a245d6d9a0c9ad615775eaedfaba98f4e910 Mon Sep 17 00:00:00 2001 From: sk593 Date: Fri, 24 Jan 2025 10:56:41 -0800 Subject: [PATCH 5/8] update to restore Signed-off-by: sk593 --- .github/workflows/functional-test-cloud.yaml | 4 ++-- .github/workflows/functional-test-noncloud.yaml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml index a831b298d5..a33ea5ee7f 100644 --- a/.github/workflows/functional-test-cloud.yaml +++ b/.github/workflows/functional-test-cloud.yaml @@ -761,9 +761,9 @@ jobs: - name: Restore Bicep artifacts before running functional tests run: | # Restore Radius Bicep types - bicep build ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep + bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force # Restore AWS Bicep types - bicep build ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep + bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force - name: Run functional tests run: | # Ensure rad cli is in path before running tests. diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index bfccf79e05..25d47daf2b 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -375,6 +375,13 @@ jobs: TEMP_CERT_DIR: ${{ steps.create-local-registry.outputs.temp-cert-dir }} SSL_CERT_FILE: ${{ steps.create-local-registry.outputs.temp-cert-dir }}/certs/${{ env.LOCAL_REGISTRY_SERVER }}/client.crt + - name: Restore Bicep artifacts before running functional tests + run: | + # Restore Radius Bicep types + bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force + # Restore AWS Bicep types + bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force + - name: Run functional tests run: | # Ensure rad cli is in path before running tests. From 71d2e246be062029895fae4063fd90457052ec9e Mon Sep 17 00:00:00 2001 From: sk593 Date: Fri, 24 Jan 2025 11:04:24 -0800 Subject: [PATCH 6/8] nit Signed-off-by: sk593 --- .github/workflows/functional-test-cloud.yaml | 4 ++-- .github/workflows/functional-test-noncloud.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml index a33ea5ee7f..03a7460f16 100644 --- a/.github/workflows/functional-test-cloud.yaml +++ b/.github/workflows/functional-test-cloud.yaml @@ -761,9 +761,9 @@ jobs: - name: Restore Bicep artifacts before running functional tests run: | # Restore Radius Bicep types - bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force + bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force # Restore AWS Bicep types - bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force + bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force - name: Run functional tests run: | # Ensure rad cli is in path before running tests. diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index 25d47daf2b..5a328b6632 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -378,9 +378,9 @@ jobs: - name: Restore Bicep artifacts before running functional tests run: | # Restore Radius Bicep types - bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force + bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force # Restore AWS Bicep types - bicep restore --file ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force + bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force - name: Run functional tests run: | From a0002907dfa902acffa345127bcc25c7b080e19a Mon Sep 17 00:00:00 2001 From: sk593 Date: Fri, 24 Jan 2025 11:20:48 -0800 Subject: [PATCH 7/8] revert Signed-off-by: sk593 --- .github/workflows/functional-test-noncloud.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml index 5a328b6632..ce6b602e09 100644 --- a/.github/workflows/functional-test-noncloud.yaml +++ b/.github/workflows/functional-test-noncloud.yaml @@ -374,13 +374,6 @@ jobs: BICEP_RECIPE_TAG_VERSION: ${{ env.REL_VERSION }} TEMP_CERT_DIR: ${{ steps.create-local-registry.outputs.temp-cert-dir }} SSL_CERT_FILE: ${{ steps.create-local-registry.outputs.temp-cert-dir }}/certs/${{ env.LOCAL_REGISTRY_SERVER }}/client.crt - - - name: Restore Bicep artifacts before running functional tests - run: | - # Restore Radius Bicep types - bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force - # Restore AWS Bicep types - bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force - name: Run functional tests run: | From 147b0803e0e4f6563b42556f2edb50249b96e846 Mon Sep 17 00:00:00 2001 From: sk593 Date: Mon, 27 Jan 2025 11:16:26 -0800 Subject: [PATCH 8/8] add comments Signed-off-by: sk593 --- .github/workflows/functional-test-cloud.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml index 03a7460f16..cd97500868 100644 --- a/.github/workflows/functional-test-cloud.yaml +++ b/.github/workflows/functional-test-cloud.yaml @@ -759,6 +759,7 @@ jobs: } EOF - name: Restore Bicep artifacts before running functional tests + # The exact files chosen to run the command can be changed, but we need 1 that uses the Radius extension and 1 that uses the AWS extension so we can restore both Bicep artifacts before the tests start run: | # Restore Radius Bicep types bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force