diff --git a/.github/workflows/buildWlsVm4AsArtifact.yml b/.github/workflows/buildWlsVm4AsArtifact.yml index e60079c91..0362b43d5 100644 --- a/.github/workflows/buildWlsVm4AsArtifact.yml +++ b/.github/workflows/buildWlsVm4AsArtifact.yml @@ -15,7 +15,7 @@ on: default: 'refs/heads/main' env: refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 offerName: "arm-oraclelinux-wls-admin" repoName: "weblogic-azure" @@ -46,7 +46,10 @@ jobs: java-version: 1.8 - name: Build azure-javaee-iaas run: mvn -DskipTests clean install --file azure-javaee-iaas/pom.xml - + - name: Update utilities path location + run: | + cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} + find . -name "*.json" | xargs sed -i 's|../../../../utilities|../utilities|g' $1 - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids run: | cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} diff --git a/.github/workflows/buildWlsVm4CcArtifact.yml b/.github/workflows/buildWlsVm4CcArtifact.yml index 068bcff25..b43db2c77 100644 --- a/.github/workflows/buildWlsVm4CcArtifact.yml +++ b/.github/workflows/buildWlsVm4CcArtifact.yml @@ -16,7 +16,7 @@ on: default: 'refs/heads/main' env: refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 offerName: "arm-oraclelinux-wls-cluster" repoName: "weblogic-azure" @@ -47,7 +47,10 @@ jobs: java-version: 1.8 - name: Build azure-javaee-iaas run: mvn -DskipTests clean install --file azure-javaee-iaas/pom.xml - + - name: Update utilities path location + run: | + cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} + find . -name "*.json" | xargs sed -i 's|../../../../../utilities|../utilities|g' $1 - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids run: | cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} diff --git a/.github/workflows/buildWlsVm4DcArtifact.yml b/.github/workflows/buildWlsVm4DcArtifact.yml index 879f3fe4d..10365e25a 100644 --- a/.github/workflows/buildWlsVm4DcArtifact.yml +++ b/.github/workflows/buildWlsVm4DcArtifact.yml @@ -16,7 +16,7 @@ on: default: 'refs/heads/main' env: refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 offerName: "arm-oraclelinux-wls-dynamic-cluster" repoName: "weblogic-azure" @@ -47,7 +47,10 @@ jobs: java-version: 1.8 - name: Build azure-javaee-iaas run: mvn -DskipTests clean install --file azure-javaee-iaas/pom.xml - + - name: Update utilities path location + run: | + cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} + find . -name "*.json" | xargs sed -i 's|../../../../../utilities|../utilities|g' $1 - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids run: | cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }} diff --git a/.github/workflows/buildWlsVm4SnArtifact.yml b/.github/workflows/buildWlsVm4SnArtifact.yml index 9950c9d28..17b289c5a 100644 --- a/.github/workflows/buildWlsVm4SnArtifact.yml +++ b/.github/workflows/buildWlsVm4SnArtifact.yml @@ -15,7 +15,7 @@ on: default: 'refs/heads/main' env: refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 offerName: "arm-oraclelinux-wls" repoName: "weblogic-azure" diff --git a/.github/workflows/newtag.yml b/.github/workflows/newtag.yml index dcc3aec1c..4cc09d932 100644 --- a/.github/workflows/newtag.yml +++ b/.github/workflows/newtag.yml @@ -21,7 +21,7 @@ env: tagbranch: "tagbranch" gitToken: ${{ secrets.GIT_TOKEN }} refArmttk: d97aa57d259e2fc8562e11501b1cf902265129d9 - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 repoName: "weblogic-azure" userEmail: ${{ secrets.USER_EMAIL }} userName: ${{ secrets.USER_NAME }} diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml index 143007cb8..99f950e29 100644 --- a/.github/workflows/testWlsVmAdmin.yml +++ b/.github/workflows/testWlsVmAdmin.yml @@ -32,7 +32,7 @@ env: adminOfferPath: weblogic-azure/weblogic-azure-vm/arm-oraclelinux-wls-admin testbranchName: cicd-${{ github.run_id }}-${{ github.run_number }} refArmTtk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 repoName: weblogic-azure repoOwner: ${{ secrets.USER_NAME }} resourceGroupPrefix: wls-${{ github.run_id }}-${{ github.run_number }} diff --git a/.github/workflows/testWlsVmCluster.yml b/.github/workflows/testWlsVmCluster.yml index 26bf9b460..2c389d6fa 100644 --- a/.github/workflows/testWlsVmCluster.yml +++ b/.github/workflows/testWlsVmCluster.yml @@ -37,7 +37,7 @@ env: offerName: arm-oraclelinux-wls-cluster offerPath: weblogic-azure/weblogic-azure-vm/arm-oraclelinux-wls-cluster refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 repoName: weblogic-azure repoOwner: ${{ secrets.USER_NAME }} resourceGroupForDependency: wlsd-${{ github.run_id }}-${{ github.run_number }} diff --git a/.github/workflows/testWlsVmDynamicCluster.yml b/.github/workflows/testWlsVmDynamicCluster.yml index 7897a29dc..76bd31607 100644 --- a/.github/workflows/testWlsVmDynamicCluster.yml +++ b/.github/workflows/testWlsVmDynamicCluster.yml @@ -39,7 +39,7 @@ env: offerPath: weblogic-azure/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster otnUser: ${{ secrets.OTN_USERID }} otnPassword: ${{ secrets.OTN_PASSWORD }} - refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f + refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4 refArmTtk: 7dc2c2a7822c2825ea3524ac2af72e561847fece repoName: weblogic-azure repoOwner: ${{ secrets.USER_NAME }} diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml index b3045df78..721936696 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml @@ -15,7 +15,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml index 12c58963e..328d5e676 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml @@ -15,7 +15,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 pom diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml index ed84222eb..b2ffe03ad 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml index c096a42a1..b681472a2 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml index a8e769f88..158896f03 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json index 3ac6e0b13..fdf8a9369 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json @@ -15,13 +15,13 @@ } }, "certificatePasswordName": { - "type": "string", + "type": "securestring", "metadata": { "description": "Secret name of certificate password." } }, "certificatePasswordValue": { - "type": "string", + "type": "securestring", "metadata": { "description": "Certificate password to store in the secret" } @@ -52,7 +52,9 @@ } } }, - "variables": {}, + "variables": { + "name_certificatePasswordName": "[parameters('certificatePasswordName')]" + }, "resources": [ { "apiVersion": "${azure.apiVersionForKeyVault}", @@ -105,7 +107,7 @@ }, "sslCertPwdSecretName": { "type": "string", - "value": "[parameters('certificatePasswordName')]" + "value": "[variables('name_certificatePasswordName')]" } } } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml index 452b0ae60..fd894cf12 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml index ffc539a09..7583d9853 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml @@ -15,7 +15,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml index 9c837c679..ef0e794c8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml @@ -15,7 +15,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml index f59303c33..d78cd7da9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml @@ -15,7 +15,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_ohsKeyVaultNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_ohsKeyVaultNestedTemplate.json index 5d48e9250..376c70679 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_ohsKeyVaultNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_ohsKeyVaultNestedTemplate.json @@ -9,7 +9,7 @@ } }, "uploadedKeyStorePassword": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Passphrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml index 1a86dbfca..4d094881c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls/pom.xml index 151f62fea..820fc8d36 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/pom.xml +++ b/weblogic-azure-vm/arm-oraclelinux-wls/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure.iaas azure-javaee-iaas-parent - 1.0.13 + 1.0.15