diff --git a/.github/actions/createPostgresqlFlexibleServer/action.yml b/.github/actions/createPostgresqlFlexibleServer/action.yml new file mode 100644 index 000000000..20a3432aa --- /dev/null +++ b/.github/actions/createPostgresqlFlexibleServer/action.yml @@ -0,0 +1,62 @@ +name: Create PostgreSQL Flexible Server +description: Create PostgreSQL Flexible Server that allows access from Azure services. +inputs: + 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: + - 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 + with: + azcliversion: ${{ env.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 \ + --yes + + 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" diff --git a/.github/actions/setvars/action.yml b/.github/actions/setvars/action.yml index dbc5e35eb..a9991b1ec 100644 --- a/.github/actions/setvars/action.yml +++ b/.github/actions/setvars/action.yml @@ -9,5 +9,5 @@ runs: using: "composite" steps: - run: | - sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV + sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV shell: bash diff --git a/.github/variables/vm-dependencies.env b/.github/variables/vm-dependencies.env index 417878a4d..84d9c771d 100644 --- a/.github/variables/vm-dependencies.env +++ b/.github/variables/vm-dependencies.env @@ -1 +1,2 @@ refArmttk=6b75cb7a3f65234995a2019fcae20a9b2c2d8635 +azCliVersion=2.60.0 diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml index 3553976dc..05104eb0a 100644 --- a/.github/workflows/setupWlsAksDependency.yml +++ b/.github/workflows/setupWlsAksDependency.yml @@ -13,34 +13,22 @@ 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: 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: @@ -52,36 +40,26 @@ 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" + 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: 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: diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml index 6e4058f2f..8e5126fc2 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: weblogicdb ocrSSOPSW: ${{ secrets.ORC_SSOPSW }} ocrSSOUser: ${{ secrets.ORC_SSOUSER }} wdtRuntimePassword: ${{ secrets.WDT_RUNTIMEPSW}} @@ -44,18 +45,25 @@ 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: + - 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: | 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 - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | @@ -131,30 +139,18 @@ 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" + 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 +265,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} \ diff --git a/.github/workflows/testWlsAksWithoutDependencyCreation.yml b/.github/workflows/testWlsAksWithoutDependencyCreation.yml index 97a59df7a..2a3a1e193 100644 --- a/.github/workflows/testWlsAksWithoutDependencyCreation.yml +++ b/.github/workflows/testWlsAksWithoutDependencyCreation.yml @@ -58,17 +58,24 @@ 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: + - 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: | 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 - name: Setup environment variables id: setup-env-variables-based-on-dispatch-event run: | @@ -225,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} \ diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml index 721327dd3..feac278e6 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,16 @@ 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: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + 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] @@ -424,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 5db7a1165..ed1883f86 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,16 @@ 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: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + 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] @@ -490,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 433feba4b..ec472fa74 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,16 @@ 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: Set up PostgreSQL Flexible Server that allows access from Azure services + uses: ./.github/actions/createPostgresqlFlexibleServer + with: + dbAdminUser: ${{ env.dbAdminUser }} + dbName: ${{ env.dbName }} + dbPassword: ${{ env.wlsPassword }} + dbServerName: ${{ env.dbServerName }} + location: ${{ env.location }} + resourceGroupName: ${{ env.resourceGroupForDependency }} deploy-weblogic-cluster: needs: preflight @@ -467,6 +457,7 @@ jobs: "${offerPath}/test/scripts/ \ ${{ env.adminVMName }} \ ${{ env.wlsPassword}} \ + ${{ env.dbAdminUser }} \ ${{ env.dbName }} \ ${{ env.location }} \ ${{ env.wlsUserName }} \ 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 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"