From 5bb3338995fa08e55314ebc30ec3ec17e62b8ad4 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 15:16:00 +0800 Subject: [PATCH 01/15] use local action to create PostgreSQL Flexible Server --- .../createPostgresqlFlexibleServer/action.yml | 59 +++++++++++++++++++ .../testWlsAksWithDependencyCreation.yml | 40 +++++-------- 2 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 .github/actions/createPostgresqlFlexibleServer/action.yml diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml new file mode 100644 index 000000000..7339fa167 --- /dev/null +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -0,0 +1,59 @@ +name: Create PostgreSQL Flexible Server +description: Create PostgreSQL Flexible Server that allows access from Azure services. +inputs: + azCliVersion: + description: "Azure CLI Version" + required: true + dbAdminUser: + description: "Database Admin User" + required: true + dbName: + description: "Database Name" + required: true + dbPassword: + description: "Database Password" + required: true + dbServerName: + description: "Database Server Name" + required: true + location: + description: "Location" + required: true + resourceGroupName: + description: "Resource Group Name" + required: true + +runs: + using: "composite" + steps: + - name: Set Up Azure Postgresql that allows access from Azure services + id: setup-postgresql + uses: azure/CLI@v1 + with: + azcliversion: ${{ inputs.azCliVersion }} + inlineScript: | + echo "Deploy DB with name " ${{ inputs.dbName }} + az postgres flexible-server create \ + --resource-group ${{ inputs.resourceGroupName }} \ + --name ${{ inputs.dbName }} \ + --location ${{ inputs.location }} \ + --admin-user ${{ inputs.dbAdminUser }} \ + --admin-password ${{ inputs.dbPassword }} \ + --version 16 \ + --public-access 0.0.0.0 \ + --tier Burstable \ + --sku-name Standard_B1ms + + az postgres flexible-server db create \ + --resource-group ${{ inputs.resourceGroupName }} \ + --server-name ${{ inputs.dbName }} \ + --database-name ${{ inputs.dbServerName }} + + sleep 1m + echo "Allow Access To Azure Services" + az postgres flexible-server firewall-rule create \ + -g ${{ inputs.resourceGroupName }} \ + -n ${{ inputs.dbName }} \ + -r "AllowAllWindowsAzureIps" \ + --start-ip-address "0.0.0.0" \ + --end-ip-address "0.0.0.0" \ No newline at end of file diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index 6e4058f2f..de3ba65a8 100644 --- a/.github/workflows/testWlsAksWithDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithDependencyCreation.yml @@ -27,6 +27,7 @@ env: dbAdminUser: weblogic dbPassword: ${{ secrets.DB_PASSWORD }} dbName: wlsdb${{ github.run_id }}${{ github.run_number }} + dbServerName: contoso ocrSSOPSW: ${{ secrets.ORC_SSOPSW }} ocrSSOUser: ${{ secrets.ORC_SSOUSER }} wdtRuntimePassword: ${{ secrets.WDT_RUNTIMEPSW}} @@ -131,30 +132,19 @@ jobs: inlineScript: | echo "create resource group" ${{ env.resourceGroupForDB }} az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }} - - name: Set Up Azure Postgresql to Test dbTemplate - id: setup-postgresql - uses: azure/CLI@v1 + + - uses: actions/checkout@v2.3.4 + - name: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer with: - azcliversion: ${{ env.azCliVersion }} - inlineScript: | - echo "Deploy DB with name " ${{ env.dbName }} - az postgres server create \ - --resource-group ${{ env.resourceGroupForDB }} \ - --name ${{ env.dbName }} \ - --location ${{ env.location }} \ - --admin-user ${{ env.dbAdminUser }} \ - --ssl-enforcement Enabled \ - --public-network-access Enabled \ - --admin-password ${{ env.dbPassword }} \ - --sku-name B_Gen5_1 - sleep 2m - echo "Allow Access To Azure Services" - az postgres server firewall-rule create \ - -g ${{ env.resourceGroupForDB }} \ - -s ${{ env.dbName }} \ - -n "AllowAllWindowsAzureIps" \ - --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" + azCliVersion: ${{ env.azCliVersion }} + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.dbPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDB }} + deploy-storage-account: needs: preflight runs-on: ubuntu-latest @@ -269,8 +259,8 @@ jobs: ${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \ "${cargoTrackerBlobUrl}" \ ${dbPassword} \ - ${dbAdminUser}@${dbName} \ - jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/postgres \ + ${dbAdminUser} \ + jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/${{ env.dbServerName }} \ ${location} \ ${ocrSSOPSW} \ ${ocrSSOUser} \ From 221945dce45fc3a92ff3b10440d3bdff6f9f1851 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 15:41:05 +0800 Subject: [PATCH 02/15] replace PostgreSQL Single Server with Flexible Server. --- .github/actions/getAzureCLIVersion/action.yml | 15 +++++ .github/workflows/setupWlsAksDependency.yml | 63 ++++++------------- .../testWlsAksWithDependencyCreation.yml | 2 +- .github/workflows/testWlsVmAdmin.yml | 38 +++++------ .github/workflows/testWlsVmCluster.yml | 40 +++++------- .github/workflows/testWlsVmDynamicCluster.yml | 38 +++++------ 6 files changed, 82 insertions(+), 114 deletions(-) create mode 100644 .github/actions/getAzureCLIVersion/action.yml diff --git a/.github/actions/getAzureCLIVersion/action.yml b/.github/actions/getAzureCLIVersion/action.yml new file mode 100644 index 000000000..928b6c656 --- /dev/null +++ b/.github/actions/getAzureCLIVersion/action.yml @@ -0,0 +1,15 @@ +name: "Get AZ CLI version" +description: "Get AZ CLI version and save with environment variable" +inputs: + url: + description: "URL to the configuration file of external dependencies." + required: false + default: https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties +runs: + using: "composite" + steps: + - shell: bash + run: | + curl -Lo external-deps-versions.properties ${{ inputs.url }} + source external-deps-versions.properties + echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml index 3553976dc..274898d54 100644 --- a/.github/workflows/setupWlsAksDependency.yml +++ b/.github/workflows/setupWlsAksDependency.yml @@ -13,34 +13,19 @@ env: dbAdminUser: weblogic dbPassword: ${{ secrets.DB_PASSWORD }} dbName: wlsdb${{ github.run_id }}${{ github.run_number }} + dbServerName: weblogicdb resourceGroupForDB: wlsd-db-${{ github.run_id }}-${{ github.run_number }} resourceGroupForStorageAccount: wlsd-sa-${{ github.run_id }}-${{ github.run_number }} storageAccountName: wlsdsa${{ github.run_id }}${{ github.run_number }} storageContainerName: wlsdcon${{ github.run_id }}${{ github.run_number }} jobs: - preflight: - outputs: - azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}} - runs-on: ubuntu-latest - steps: - - name: Get versions of external dependencies - id: get-external-dependencies-version - run: | - curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties - source external-deps-versions.properties - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 deploy-db: - needs: preflight runs-on: ubuntu-latest steps: - - name: Get AZ CLI Version - run: | - echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV + - uses: actions/checkout@v2.3.4 + - name: Get Azure CLI Version and save with environment variable `azCliVersion` + uses: ./.github/actions/getAzureCLIVersion - uses: azure/login@v1 id: azure-login with: @@ -52,36 +37,24 @@ jobs: inlineScript: | echo "create resource group" ${{ env.resourceGroupForDB }} az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }} - - name: Set Up Azure Postgresql to Test dbTemplate - id: setup-postgresql - uses: azure/CLI@v1 + + - uses: actions/checkout@v2.3.4 + - name: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer with: - azcliversion: ${{ env.azCliVersion }} - inlineScript: | - echo "Deploy DB with name " ${{ env.dbName }} - az postgres server create \ - --resource-group ${{ env.resourceGroupForDB }} \ - --name ${{ env.dbName }} \ - --location ${{ env.location }} \ - --admin-user ${{ env.dbAdminUser }} \ - --ssl-enforcement Enabled \ - --public-network-access Enabled \ - --admin-password ${{ env.dbPassword }} \ - --sku-name B_Gen5_1 - echo "Allow Access To Azure Services" - az postgres server firewall-rule create \ - -g ${{ env.resourceGroupForDB }} \ - -s ${{ env.dbName }} \ - -n "AllowAllWindowsAzureIps" \ - --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" + azCliVersion: ${{ env.azCliVersion }} + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.dbPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDB }} deploy-storage-account: - needs: preflight runs-on: ubuntu-latest steps: - - name: Get AZ CLI Version - run: | - echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV + - uses: actions/checkout@v2.3.4 + - name: Get Azure CLI Version and save with environment variable `azCliVersion` + uses: ./.github/actions/getAzureCLIVersion - uses: azure/login@v1 id: azure-login with: diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index de3ba65a8..197d52691 100644 --- a/.github/workflows/testWlsAksWithDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithDependencyCreation.yml @@ -27,7 +27,7 @@ env: dbAdminUser: weblogic dbPassword: ${{ secrets.DB_PASSWORD }} dbName: wlsdb${{ github.run_id }}${{ github.run_number }} - dbServerName: contoso + dbServerName: weblogicdb ocrSSOPSW: ${{ secrets.ORC_SSOPSW }} ocrSSOUser: ${{ secrets.ORC_SSOUSER }} wdtRuntimePassword: ${{ secrets.WDT_RUNTIMEPSW}} diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml index 721327dd3..fb31cd3a3 100644 --- a/.github/workflows/testWlsVmAdmin.yml +++ b/.github/workflows/testWlsVmAdmin.yml @@ -25,7 +25,9 @@ env: adminConsolePort: 7005 adminVMName: adminServerVM adminPassword: ${{ secrets.WLS_PSW }} + dbAdminUser: weblogic dbName: wlsdb${{ github.run_id }}${{ github.run_number }} + dbServerName: weblogicdb elkURI: ${{ secrets.ELK_URI }} elkUser: ${{ secrets.ELK_USER_NAME }} elkPassword: ${{ secrets.ELK_PSW }} @@ -180,28 +182,20 @@ jobs: run: | echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - - - name: Set Up Azure Postgresql to Test dbTemplate - id: setup-postgresql - run: | - echo "Deploy DB with name " ${{ env.dbName }} - az postgres server create \ - --resource-group ${{ env.resourceGroupForDependency }} \ - --name ${{ env.dbName }} \ - --location ${location} \ - --admin-user weblogic \ - --ssl-enforcement Enabled \ - --public-network-access Enabled \ - --admin-password ${{ env.wlsPassword }} \ - --sku-name B_Gen5_1 - - echo "Allow Access To Azure Services" - az postgres server firewall-rule create \ - -g ${{ env.resourceGroupForDependency }} \ - -s ${{ env.dbName }} \ - -n "AllowAllWindowsAzureIps" \ - --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" + - uses: actions/checkout@v2.3.4 + - name: Get Azure CLI Version and save with environment variable `azCliVersion` + uses: ./.github/actions/getAzureCLIVersion + - uses: actions/checkout@v2.3.4 + - name: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + azCliVersion: ${{ env.azCliVersion }} + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.wlsPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDependency }} deploy-weblogic-admin: needs: [deploy-dependencies, preflight] diff --git a/.github/workflows/testWlsVmCluster.yml b/.github/workflows/testWlsVmCluster.yml index 5db7a1165..40404886d 100644 --- a/.github/workflows/testWlsVmCluster.yml +++ b/.github/workflows/testWlsVmCluster.yml @@ -25,7 +25,9 @@ env: adminConsolePort: 7001 adminPassword: ${{ secrets.WLS_PSW }} adminVMName: adminServerVM + dbAdminUser: weblogic dbName: wlsdb${{ github.run_id }}${{ github.run_number }} + dbServerName: weblogicdb elkURI: ${{ secrets.ELK_URI }} elkUser: ${{ secrets.ELK_USER_NAME }} elkPassword: ${{ secrets.ELK_PSW }} @@ -214,30 +216,20 @@ jobs: run: | echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - - - name: Set Up Azure Postgresql to Test dbTemplate - id: setup-postgresql - run: | - echo "Deploy DB with name " ${{ env.dbName }} - az postgres server create \ - --resource-group ${{ env.resourceGroupForDependency }} \ - --name ${{ env.dbName }} \ - --location ${location} \ - --admin-user weblogic \ - --ssl-enforcement Enabled \ - --public-network-access Enabled \ - --admin-password ${{ env.wlsPassword }} \ - --sku-name B_Gen5_1 - - sleep 2m - - echo "Allow Access To Azure Services" - az postgres server firewall-rule create \ - -g ${{ env.resourceGroupForDependency }} \ - -s ${{ env.dbName }} \ - -n "AllowAllWindowsAzureIps" \ - --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" + - uses: actions/checkout@v2.3.4 + - name: Get Azure CLI Version and save with environment variable `azCliVersion` + uses: ./.github/actions/getAzureCLIVersion + - uses: actions/checkout@v2.3.4 + - name: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + azCliVersion: ${{ env.azCliVersion }} + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.wlsPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDependency }} deploy-weblogic-cluster: needs: [deploy-dependencies, preflight] diff --git a/.github/workflows/testWlsVmDynamicCluster.yml b/.github/workflows/testWlsVmDynamicCluster.yml index 433feba4b..c07eabea3 100644 --- a/.github/workflows/testWlsVmDynamicCluster.yml +++ b/.github/workflows/testWlsVmDynamicCluster.yml @@ -21,7 +21,9 @@ env: adminConsolePort: 7001 adminPassword: ${{ secrets.WLS_PSW }} adminVMName: adminServerVM + dbAdminUser: weblogic dbName: wlsdb${{ github.run_id }}${{ github.run_number }} + dbServerName: weblogicdb dynamicClusterSize: 1 elkURI: ${{ secrets.ELK_URI }} elkUser: ${{ secrets.ELK_USER_NAME }} @@ -192,28 +194,20 @@ jobs: run: | echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - - - name: Set Up Azure Postgresql to Test dbTemplate - id: setup-postgresql - run: | - echo "Deploy DB with name " ${{ env.dbName }} - az postgres server create \ - --resource-group ${{ env.resourceGroupForDependency }} \ - --name ${{ env.dbName }} \ - --location ${location} \ - --admin-user weblogic \ - --ssl-enforcement Enabled \ - --public-network-access Enabled \ - --admin-password ${{ env.wlsPassword }} \ - --sku-name B_Gen5_1 - - echo "Allow Access To Azure Services" - az postgres server firewall-rule create \ - -g ${{ env.resourceGroupForDependency }} \ - -s ${{ env.dbName }} \ - -n "AllowAllWindowsAzureIps" \ - --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" + - uses: actions/checkout@v2.3.4 + - name: Get Azure CLI Version and save with environment variable `azCliVersion` + uses: ./.github/actions/getAzureCLIVersion + - uses: actions/checkout@v2.3.4 + - name: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + azCliVersion: ${{ env.azCliVersion }} + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.wlsPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDependency }} deploy-weblogic-cluster: needs: preflight From 33ca482c1c7982e47592d510728b5ae2d08da9b6 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 15:46:05 +0800 Subject: [PATCH 03/15] fix for "Parameter 'PrivateDnsZoneArmResourceId' must be specified" --- .github/actions/createPostgresqlFlexibleServer/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml index 7339fa167..60a4f31a8 100644 --- a/.github/actions/createPostgresqlFlexibleServer/action.yml +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -40,7 +40,6 @@ runs: --admin-user ${{ inputs.dbAdminUser }} \ --admin-password ${{ inputs.dbPassword }} \ --version 16 \ - --public-access 0.0.0.0 \ --tier Burstable \ --sku-name Standard_B1ms From 575f0b8561cf49cf93696a576801a1dcd3f9d866 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 15:48:43 +0800 Subject: [PATCH 04/15] fix for "Unable to prompt for confirmation as no tty available. Use --yes." --- .github/actions/createPostgresqlFlexibleServer/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml index 60a4f31a8..6df7aef65 100644 --- a/.github/actions/createPostgresqlFlexibleServer/action.yml +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -41,7 +41,8 @@ runs: --admin-password ${{ inputs.dbPassword }} \ --version 16 \ --tier Burstable \ - --sku-name Standard_B1ms + --sku-name Standard_B1ms \ + --yes az postgres flexible-server db create \ --resource-group ${{ inputs.resourceGroupName }} \ From bf8ef5c247c9ab55df0a31cca81418765186c53e Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 15:52:27 +0800 Subject: [PATCH 05/15] fix db deployment failure --- .github/actions/createPostgresqlFlexibleServer/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml index 6df7aef65..c8efd6310 100644 --- a/.github/actions/createPostgresqlFlexibleServer/action.yml +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -40,8 +40,10 @@ runs: --admin-user ${{ inputs.dbAdminUser }} \ --admin-password ${{ inputs.dbPassword }} \ --version 16 \ + --public-access 0.0.0.0 \ --tier Burstable \ --sku-name Standard_B1ms \ + --private-dns-zone "zone-${{ inputs.dbName }}" \ --yes az postgres flexible-server db create \ From acad5cfc5330b7e3b437e0032ade0e8b809f396b Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 17:08:29 +0800 Subject: [PATCH 06/15] use az cli 2.58.0. --- .../createPostgresqlFlexibleServer/action.yml | 10 ++++++---- .github/actions/getAzureCLIVersion/action.yml | 15 --------------- .github/variables/vm-dependencies.env | 1 + .github/workflows/setupWlsAksDependency.yml | 1 - .../testWlsAksWithDependencyCreation.yml | 1 - .github/workflows/testWlsVmAdmin.yml | 4 ---- .github/workflows/testWlsVmCluster.yml | 4 ---- .github/workflows/testWlsVmDynamicCluster.yml | 4 ---- 8 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 .github/actions/getAzureCLIVersion/action.yml diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml index c8efd6310..017c24457 100644 --- a/.github/actions/createPostgresqlFlexibleServer/action.yml +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -1,9 +1,6 @@ name: Create PostgreSQL Flexible Server description: Create PostgreSQL Flexible Server that allows access from Azure services. inputs: - azCliVersion: - description: "Azure CLI Version" - required: true dbAdminUser: description: "Database Admin User" required: true @@ -26,6 +23,11 @@ inputs: runs: using: "composite" steps: + - uses: actions/checkout@v2.3.4 + - name: Set azCliVersion + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env - name: Set Up Azure Postgresql that allows access from Azure services id: setup-postgresql uses: azure/CLI@v1 @@ -43,7 +45,7 @@ runs: --public-access 0.0.0.0 \ --tier Burstable \ --sku-name Standard_B1ms \ - --private-dns-zone "zone-${{ inputs.dbName }}" \ + --private-dns-zone zone$(date +%s) \ --yes az postgres flexible-server db create \ diff --git a/.github/actions/getAzureCLIVersion/action.yml b/.github/actions/getAzureCLIVersion/action.yml deleted file mode 100644 index 928b6c656..000000000 --- a/.github/actions/getAzureCLIVersion/action.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: "Get AZ CLI version" -description: "Get AZ CLI version and save with environment variable" -inputs: - url: - description: "URL to the configuration file of external dependencies." - required: false - default: https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties -runs: - using: "composite" - steps: - - shell: bash - run: | - curl -Lo external-deps-versions.properties ${{ inputs.url }} - source external-deps-versions.properties - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV diff --git a/.github/variables/vm-dependencies.env b/.github/variables/vm-dependencies.env index 417878a4d..b894da835 100644 --- a/.github/variables/vm-dependencies.env +++ b/.github/variables/vm-dependencies.env @@ -1 +1,2 @@ refArmttk=6b75cb7a3f65234995a2019fcae20a9b2c2d8635 +azCliVersion=2.58.0 diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml index 274898d54..a4750e86b 100644 --- a/.github/workflows/setupWlsAksDependency.yml +++ b/.github/workflows/setupWlsAksDependency.yml @@ -42,7 +42,6 @@ jobs: - name: Set up PostgreSQL Flexible Server that allows access from Azure services uses: ./.github/actions/createPostgresqlFlexibleServer with: - azCliVersion: ${{ env.azCliVersion }} dbAdminUser: ${{ env.dbAdminUser }} dbName: ${{ env.dbName }} dbPassword: ${{ env.dbPassword }} diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index 197d52691..a62d17342 100644 --- a/.github/workflows/testWlsAksWithDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithDependencyCreation.yml @@ -137,7 +137,6 @@ jobs: - name: Set up PostgreSQL Flexible Server that allows access from Azure services uses: ./.github/actions/createPostgresqlFlexibleServer with: - azCliVersion: ${{ env.azCliVersion }} dbAdminUser: ${{ env.dbAdminUser }} dbName: ${{ env.dbName }} dbPassword: ${{ env.dbPassword }} diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml index fb31cd3a3..885d2f2f3 100644 --- a/.github/workflows/testWlsVmAdmin.yml +++ b/.github/workflows/testWlsVmAdmin.yml @@ -183,13 +183,9 @@ jobs: echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - uses: actions/checkout@v2.3.4 - - name: Get Azure CLI Version and save with environment variable `azCliVersion` - uses: ./.github/actions/getAzureCLIVersion - - uses: actions/checkout@v2.3.4 - name: Set up PostgreSQL Flexible Server that allows access from Azure services uses: ./.github/actions/createPostgresqlFlexibleServer with: - azCliVersion: ${{ env.azCliVersion }} dbAdminUser: ${{ env.dbAdminUser }} dbName: ${{ env.dbName }} dbPassword: ${{ env.wlsPassword }} diff --git a/.github/workflows/testWlsVmCluster.yml b/.github/workflows/testWlsVmCluster.yml index 40404886d..63fb98cfc 100644 --- a/.github/workflows/testWlsVmCluster.yml +++ b/.github/workflows/testWlsVmCluster.yml @@ -217,13 +217,9 @@ jobs: echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - uses: actions/checkout@v2.3.4 - - name: Get Azure CLI Version and save with environment variable `azCliVersion` - uses: ./.github/actions/getAzureCLIVersion - - uses: actions/checkout@v2.3.4 - name: Set up PostgreSQL Flexible Server that allows access from Azure services uses: ./.github/actions/createPostgresqlFlexibleServer with: - azCliVersion: ${{ env.azCliVersion }} dbAdminUser: ${{ env.dbAdminUser }} dbName: ${{ env.dbName }} dbPassword: ${{ env.wlsPassword }} diff --git a/.github/workflows/testWlsVmDynamicCluster.yml b/.github/workflows/testWlsVmDynamicCluster.yml index c07eabea3..3eab2a36f 100644 --- a/.github/workflows/testWlsVmDynamicCluster.yml +++ b/.github/workflows/testWlsVmDynamicCluster.yml @@ -195,13 +195,9 @@ jobs: echo "create resource group" ${{ env.resourceGroupForDependency }} az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location} - uses: actions/checkout@v2.3.4 - - name: Get Azure CLI Version and save with environment variable `azCliVersion` - uses: ./.github/actions/getAzureCLIVersion - - uses: actions/checkout@v2.3.4 - name: Set up PostgreSQL Flexible Server that allows access from Azure services uses: ./.github/actions/createPostgresqlFlexibleServer with: - azCliVersion: ${{ env.azCliVersion }} dbAdminUser: ${{ env.dbAdminUser }} dbName: ${{ env.dbName }} dbPassword: ${{ env.wlsPassword }} From 02ec3ca48028a264d2eaf0c4751a742e726b828b Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 17:14:14 +0800 Subject: [PATCH 07/15] use the same az cli version --- .github/actions/setvars/action.yml | 1 + .github/workflows/testWlsAksWithDependencyCreation.yml | 10 +++++++--- .../workflows/testWlsAksWithoutDependencyCreation.yml | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/actions/setvars/action.yml b/.github/actions/setvars/action.yml index dbc5e35eb..82251823d 100644 --- a/.github/actions/setvars/action.yml +++ b/.github/actions/setvars/action.yml @@ -10,4 +10,5 @@ runs: steps: - run: | sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV + sed "" ${{ inputs.varFilePath }} >> $GITHUB_OUTPUT shell: bash diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index a62d17342..9e67516a8 100644 --- a/.github/workflows/testWlsAksWithDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithDependencyCreation.yml @@ -45,7 +45,7 @@ jobs: isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }} gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }} testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }} - azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}} + azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}} runs-on: ubuntu-latest steps: - name: Get versions of external dependencies @@ -53,10 +53,14 @@ jobs: run: | curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties source external-deps-versions.properties - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT + - uses: actions/checkout@v2.3.4 + - name: Set AZ CLI Version + id: set-az-cli-version + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | diff --git a/.github/workflows/testWlsAksWithoutDependencyCreation.yml b/.github/workflows/testWlsAksWithoutDependencyCreation.yml index 97a59df7a..3eb1eb4b4 100644 --- a/.github/workflows/testWlsAksWithoutDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithoutDependencyCreation.yml @@ -58,17 +58,21 @@ jobs: isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }} gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }} testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }} - azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}} + azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}} steps: - name: Get versions of external dependencies id: get-external-dependencies-version run: | curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties source external-deps-versions.properties - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV - echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT + - uses: actions/checkout@v2.3.4 + - name: Set AZ CLI Version + id: set-az-cli-version + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | From 40551076735edd6e8e5747dbb55f324bf60eb27e Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 17:20:33 +0800 Subject: [PATCH 08/15] remove ./.github/actions/getAzureCLIVersion --- .github/workflows/setupWlsAksDependency.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml index a4750e86b..6abe40bfd 100644 --- a/.github/workflows/setupWlsAksDependency.yml +++ b/.github/workflows/setupWlsAksDependency.yml @@ -23,9 +23,11 @@ jobs: deploy-db: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - name: Get Azure CLI Version and save with environment variable `azCliVersion` - uses: ./.github/actions/getAzureCLIVersion + - name: Set AZ CLI Version + id: set-az-cli-version + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env - uses: azure/login@v1 id: azure-login with: @@ -51,9 +53,11 @@ jobs: deploy-storage-account: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - name: Get Azure CLI Version and save with environment variable `azCliVersion` - uses: ./.github/actions/getAzureCLIVersion + - name: Set AZ CLI Version + id: set-az-cli-version + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env - uses: azure/login@v1 id: azure-login with: From 265739eeed7dbbce9ed4d0f32e0b72f672b41e74 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Mon, 13 May 2024 17:23:16 +0800 Subject: [PATCH 09/15] uses: actions/checkout@v2.3.4 for local action --- .github/workflows/setupWlsAksDependency.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml index 6abe40bfd..05104eb0a 100644 --- a/.github/workflows/setupWlsAksDependency.yml +++ b/.github/workflows/setupWlsAksDependency.yml @@ -23,6 +23,7 @@ jobs: deploy-db: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2.3.4 - name: Set AZ CLI Version id: set-az-cli-version uses: ./.github/actions/setvars @@ -53,6 +54,7 @@ jobs: deploy-storage-account: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2.3.4 - name: Set AZ CLI Version id: set-az-cli-version uses: ./.github/actions/setvars From d6a5aa108d7096872a83e2ec1f519bdfe8c7bcb0 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 09:51:15 +0800 Subject: [PATCH 10/15] use az cli 2.60.0 --- .github/variables/vm-dependencies.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/variables/vm-dependencies.env b/.github/variables/vm-dependencies.env index b894da835..84d9c771d 100644 --- a/.github/variables/vm-dependencies.env +++ b/.github/variables/vm-dependencies.env @@ -1,2 +1,2 @@ refArmttk=6b75cb7a3f65234995a2019fcae20a9b2c2d8635 -azCliVersion=2.58.0 +azCliVersion=2.60.0 From eb962cdb1e42622a40502101060b918dd9803067 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 09:53:32 +0800 Subject: [PATCH 11/15] Update action.yml --- .github/actions/createPostgresqlFlexibleServer/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml index 017c24457..20a3432aa 100644 --- a/.github/actions/createPostgresqlFlexibleServer/action.yml +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -32,7 +32,7 @@ runs: id: setup-postgresql uses: azure/CLI@v1 with: - azcliversion: ${{ inputs.azCliVersion }} + azcliversion: ${{ env.azCliVersion }} inlineScript: | echo "Deploy DB with name " ${{ inputs.dbName }} az postgres flexible-server create \ @@ -45,7 +45,6 @@ runs: --public-access 0.0.0.0 \ --tier Burstable \ --sku-name Standard_B1ms \ - --private-dns-zone zone$(date +%s) \ --yes az postgres flexible-server db create \ @@ -60,4 +59,4 @@ runs: -n ${{ inputs.dbName }} \ -r "AllowAllWindowsAzureIps" \ --start-ip-address "0.0.0.0" \ - --end-ip-address "0.0.0.0" \ No newline at end of file + --end-ip-address "0.0.0.0" From 59feab9dfcc7e1ebba27855098d833a0fa70e6c0 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 02:09:59 +0000 Subject: [PATCH 12/15] update db user name for flexible server. --- .github/workflows/testWlsVmAdmin.yml | 1 + .github/workflows/testWlsVmCluster.yml | 1 + .github/workflows/testWlsVmDynamicCluster.yml | 1 + .../test/scripts/gen-parameters-deploy-db.sh | 4 ++-- .../test/scripts/gen-parameters-deploy-db.sh | 4 ++-- .../test/scripts/gen-parameters-deploy-db.sh | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml index 885d2f2f3..feac278e6 100644 --- a/.github/workflows/testWlsVmAdmin.yml +++ b/.github/workflows/testWlsVmAdmin.yml @@ -414,6 +414,7 @@ jobs: <<< "${{ env.adminOfferPath }}/test/scripts/ \ ${{ env.adminVMName }} \ ${{ env.wlsPassword}} \ + ${{ env.dbAdminUser }} \ ${{ env.dbName }} \ ${{ env.location }} \ ${{ env.wlsUserName }} \ diff --git a/.github/workflows/testWlsVmCluster.yml b/.github/workflows/testWlsVmCluster.yml index 63fb98cfc..ed1883f86 100644 --- a/.github/workflows/testWlsVmCluster.yml +++ b/.github/workflows/testWlsVmCluster.yml @@ -478,6 +478,7 @@ jobs: <<< "${{ env.offerPath }}/test/scripts/ \ ${{ env.adminVMName }} \ ${{ env.wlsPassword}} \ + ${{ env.dbAdminUser }} \ ${{ env.dbName }} \ ${{ env.location }} \ ${{ env.wlsUserName }} \ diff --git a/.github/workflows/testWlsVmDynamicCluster.yml b/.github/workflows/testWlsVmDynamicCluster.yml index 3eab2a36f..ec472fa74 100644 --- a/.github/workflows/testWlsVmDynamicCluster.yml +++ b/.github/workflows/testWlsVmDynamicCluster.yml @@ -457,6 +457,7 @@ jobs: "${offerPath}/test/scripts/ \ ${{ env.adminVMName }} \ ${{ env.wlsPassword}} \ + ${{ env.dbAdminUser }} \ ${{ env.dbName }} \ ${{ env.location }} \ ${{ env.wlsUserName }} \ diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh index e33770d4e..766651013 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh @@ -5,7 +5,7 @@ #Generate parameters with value for deploying db template independently #read arguments from stdin -read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword repoPath testbranchName +read parametersPath adminVMName dbPassword dbAdminUser dbName location wlsusername wlspassword repoPath testbranchName cat < ${parametersPath}/parameters-deploy-db.json { @@ -19,7 +19,7 @@ cat < ${parametersPath}/parameters-deploy-db.json "value": "${dbPassword}" }, "dbUser": { - "value": "weblogic@${dbName}" + "value": "${dbAdminUser}" }, "dsConnectionURL": { "value": "jdbc:postgresql://${dbName}.postgres.database.azure.com:5432/postgres?sslmode=require" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh index 6ff6e8b5a..0da0bf200 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh @@ -6,7 +6,7 @@ # Generate parameters with value for deploying db template independently #read arguments from stdin -read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword repoPath testbranchName +read parametersPath adminVMName dbPassword dbAdminUser dbName location wlsusername wlspassword repoPath testbranchName cat < ${parametersPath}/parameters-deploy-db.json { @@ -20,7 +20,7 @@ cat < ${parametersPath}/parameters-deploy-db.json "value": "${dbPassword}" }, "dbUser": { - "value": "weblogic@${dbName}" + "value": "${dbAdminUser}" }, "dsConnectionURL": { "value": "jdbc:postgresql://${dbName}.postgres.database.azure.com:5432/postgres?sslmode=require" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh index e61e08ad0..48f0234ba 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-db.sh @@ -4,7 +4,7 @@ # #Generate parameters with value for deploying db template independently -read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword repoPath testbranchName +read parametersPath adminVMName dbPassword dbAdminUser dbName location wlsusername wlspassword repoPath testbranchName cat < ${parametersPath}/parameters-deploy-db.json { @@ -18,7 +18,7 @@ cat < ${parametersPath}/parameters-deploy-db.json "value": "${dbPassword}" }, "dbUser": { - "value": "weblogic@${dbName}" + "value": "${dbAdminUser}" }, "dsConnectionURL": { "value": "jdbc:postgresql://${dbName}.postgres.database.azure.com:5432/postgres?sslmode=require" From 94858a2ee2f010af756e56c1b310295c72053a16 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 02:26:20 +0000 Subject: [PATCH 13/15] output azCliVersion. --- .github/actions/setvars/action.yml | 3 +-- .../testWlsAksWithDependencyCreation.yml | 15 +++++++++------ .../testWlsAksWithoutDependencyCreation.yml | 15 +++++++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/actions/setvars/action.yml b/.github/actions/setvars/action.yml index 82251823d..a9991b1ec 100644 --- a/.github/actions/setvars/action.yml +++ b/.github/actions/setvars/action.yml @@ -9,6 +9,5 @@ runs: using: "composite" steps: - run: | - sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV - sed "" ${{ inputs.varFilePath }} >> $GITHUB_OUTPUT + sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index 9e67516a8..8e5126fc2 100644 --- a/.github/workflows/testWlsAksWithDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithDependencyCreation.yml @@ -48,6 +48,15 @@ jobs: azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}} runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2.3.4 + - name: Set AZ CLI Version and save in variable azCliVersion + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env + - name: Output Az CLi version + id: set-az-cli-version + run: | + echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT - name: Get versions of external dependencies id: get-external-dependencies-version run: | @@ -55,12 +64,6 @@ jobs: source external-deps-versions.properties echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV - - uses: actions/checkout@v2.3.4 - - name: Set AZ CLI Version - id: set-az-cli-version - uses: ./.github/actions/setvars - with: - varFilePath: ./.github/variables/vm-dependencies.env - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | diff --git a/.github/workflows/testWlsAksWithoutDependencyCreation.yml b/.github/workflows/testWlsAksWithoutDependencyCreation.yml index 3eb1eb4b4..c59503ca3 100644 --- a/.github/workflows/testWlsAksWithoutDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithoutDependencyCreation.yml @@ -60,6 +60,15 @@ jobs: testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }} azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}} steps: + - uses: actions/checkout@v2.3.4 + - name: Set AZ CLI Version + uses: ./.github/actions/setvars + with: + varFilePath: ./.github/variables/vm-dependencies.env + - name: Output Az CLi version + id: set-az-cli-version + run: | + echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT - name: Get versions of external dependencies id: get-external-dependencies-version run: | @@ -67,12 +76,6 @@ jobs: source external-deps-versions.properties echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV - - uses: actions/checkout@v2.3.4 - - name: Set AZ CLI Version - id: set-az-cli-version - uses: ./.github/actions/setvars - with: - varFilePath: ./.github/variables/vm-dependencies.env - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | From 9f5881ead65d9402c6570ee4d009689312d04b03 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 03:26:56 +0000 Subject: [PATCH 14/15] increase pom version. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 88a8a147e..7b608bf12 100644 --- a/pom.xml +++ b/pom.xml @@ -40,12 +40,12 @@ - 1.0.75 + 1.0.76 1.0.27 - 1.0.50 - 1.0.660000 - 1.0.49 + 1.0.51 + 1.0.670000 + 1.0.50 1.0.7 1.0.3 From 3933623ae19fd2638141dcb445f92dd80f9be810 Mon Sep 17 00:00:00 2001 From: Galia Cheng Date: Wed, 15 May 2024 05:56:55 +0000 Subject: [PATCH 15/15] fix db name. --- .github/workflows/testWlsAksWithoutDependencyCreation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testWlsAksWithoutDependencyCreation.yml b/.github/workflows/testWlsAksWithoutDependencyCreation.yml index c59503ca3..2a3a1e193 100644 --- a/.github/workflows/testWlsAksWithoutDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithoutDependencyCreation.yml @@ -232,7 +232,7 @@ jobs: ${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \ "${cargoTrackerBlobUrl}" \ ${dbPassword} \ - ${dbAdminUser}@${{ needs.preflight.outputs.dbName }} \ + ${dbAdminUser} \ jdbc:postgresql:\/\/${{ needs.preflight.outputs.dbName }}.postgres.database.azure.com:5432\/postgres \ ${location} \ ${ocrSSOPSW} \