From 5824d6aa821fff1526186541f4337334d0b21043 Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 11:16:18 -0800 Subject: [PATCH 1/7] Test github issue --- .github/workflows/run-validation.yml | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index 43e2a91..d554348 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -589,6 +589,36 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + update-using-image-and-env-variables: + + name: 'Update app using image' + runs-on: ubuntu-latest + timeout-minutes: 10 + + env: + TEST_CONTAINER_APP_NAME: 'update-using-image-app' + + steps: + - name: Checkout action repository + uses: actions/checkout@v3 + + - name: Log in to Azure + uses: azure/login@v1 + with: + creds: ${{ secrets.TEST_AZURE_CREDENTIALS }} + + - name: Execute Azure Container Apps Build and Deploy Action + uses: ./ + with: + appSourcePath: ${github.workspace} + acrName: ${{ vars.TEST_ACR_NAME }} + imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} + targetPort: 80 + containerAppName: ${{ vars.TEST_EXISTING_CONTAINER_APP }} + environmentVariables: 'TEST_ENV_VAR_1=TEST_ENV_VAR_1_VALUE,TEST_ENV_VAR_2=TEST_ENV_VAR_2_VALUE' + resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} + disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + update-using-image-yaml: name: 'Update app using image with YAML configuration' From b66bdce758e3a95d87767e3c119890461af3966b Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 11:19:14 -0800 Subject: [PATCH 2/7] Refactor --- .github/workflows/run-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index d554348..d320025 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -591,7 +591,7 @@ jobs: update-using-image-and-env-variables: - name: 'Update app using image' + name: 'Update app using image and environment variables' runs-on: ubuntu-latest timeout-minutes: 10 From e1a58351700ed53dcca9b29997fe0fffff6ddfde Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 11:20:56 -0800 Subject: [PATCH 3/7] Fix app source path --- .github/workflows/run-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index d320025..7ed9f86 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -610,7 +610,7 @@ jobs: - name: Execute Azure Container Apps Build and Deploy Action uses: ./ with: - appSourcePath: ${github.workspace} + appSourcePath: ${{ github.workspace }} acrName: ${{ vars.TEST_ACR_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} targetPort: 80 From c8a1f40bdf81182f5e13f23c9048a687cca8ad4e Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 11:23:46 -0800 Subject: [PATCH 4/7] Fix app source path --- .github/workflows/run-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index 7ed9f86..ce441ef 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -610,7 +610,7 @@ jobs: - name: Execute Azure Container Apps Build and Deploy Action uses: ./ with: - appSourcePath: ${{ github.workspace }} + appSourcePath: ${{ github.workspace }}/oryx/tests/SampleApps/DotNetCore/NetCore6PreviewWebApp acrName: ${{ vars.TEST_ACR_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} targetPort: 80 From 771e41777b71739dfd99396136989dbd3411189f Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 11:35:40 -0800 Subject: [PATCH 5/7] Add step to clone oryx --- .github/workflows/run-validation.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index ce441ef..a1105e0 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -602,6 +602,12 @@ jobs: - name: Checkout action repository uses: actions/checkout@v3 + - name: Clone Oryx repository + uses: actions/checkout@v3 + with: + repository: microsoft/Oryx + path: oryx + - name: Log in to Azure uses: azure/login@v1 with: From f3e311beb2b616588959f1692aa00a050383726f Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 12:10:09 -0800 Subject: [PATCH 6/7] Fix pipeline --- .github/workflows/run-validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index a1105e0..842cf65 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -596,6 +596,7 @@ jobs: timeout-minutes: 10 env: + TEST_IMAGE_TAG: 'fd-${{ github.run_id }}' TEST_CONTAINER_APP_NAME: 'update-using-image-app' steps: From 63114ca796a53e009110299d0b08666dbc34679c Mon Sep 17 00:00:00 2001 From: Sneha Parthasarathy Date: Wed, 10 Jan 2024 12:39:46 -0800 Subject: [PATCH 7/7] Refactor pipeline --- .github/workflows/run-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index 842cf65..2cdd388 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -621,7 +621,7 @@ jobs: acrName: ${{ vars.TEST_ACR_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} targetPort: 80 - containerAppName: ${{ vars.TEST_EXISTING_CONTAINER_APP }} + containerAppName: ${{ env.TEST_CONTAINER_APP_NAME }} environmentVariables: 'TEST_ENV_VAR_1=TEST_ENV_VAR_1_VALUE,TEST_ENV_VAR_2=TEST_ENV_VAR_2_VALUE' resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }}