Skip to content

Modify build workflows for VMs to include artifacts from utilities #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 26, 2022
Merged

Modify build workflows for VMs to include artifacts from utilities #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
610f498
Updated parameters to securestring as per workflow error message
Apr 8, 2022
01a3093
Updated workflows with refJavaee and utilities section
Apr 8, 2022
b483087
Updated azure-javaee-iaas-parent version
Apr 8, 2022
0f7ad65
Updated parameters to securestring as per workflow error message
Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/buildWlsVm4AsArtifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
default: 'refs/heads/main'
env:
refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f
refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
offerName: "arm-oraclelinux-wls-admin"
repoName: "weblogic-azure"

Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/buildWlsVm4CcArtifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
default: 'refs/heads/main'
env:
refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f
refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
offerName: "arm-oraclelinux-wls-cluster"
repoName: "weblogic-azure"

Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/buildWlsVm4DcArtifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildWlsVm4SnArtifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
default: 'refs/heads/main'
env:
refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
refJavaee: 13fe6ec487024eb61355d661ab5700ae90cb0a8f
refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
offerName: "arm-oraclelinux-wls"
repoName: "weblogic-azure"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/newtag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testWlsVmAdmin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testWlsVmCluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testWlsVmDynamicCluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
10 changes: 6 additions & 4 deletions ...wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -52,7 +52,9 @@
}
}
},
"variables": {},
"variables": {
"name_certificatePasswordName": "[parameters('certificatePasswordName')]"
},
"resources": [
{
"apiVersion": "${azure.apiVersionForKeyVault}",
Expand Down Expand Up @@ -105,7 +107,7 @@
},
"sslCertPwdSecretName": {
"type": "string",
"value": "[parameters('certificatePasswordName')]"
"value": "[variables('name_certificatePasswordName')]"
}
}
}
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...clelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_ohsKeyVaultNestedTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
},
"uploadedKeyStorePassword": {
"type": "string",
"type": "securestring",
"metadata": {
"description": "Custom Identity KeyStore Passphrase"
}
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure.iaas</groupId>
<artifactId>azure-javaee-iaas-parent</artifactId>
<version>1.0.13</version>
<version>1.0.15</version>
<relativePath></relativePath>
</parent>

Expand Down