Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/testWlsAksWithDependencyCreation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:
--public-network-access Enabled \
--admin-password ${{ env.dbPassword }} \
--sku-name B_Gen5_1
sleep 1m
sleep 2m
echo "Allow Access To Azure Services"
az postgres server firewall-rule create \
-g ${{ env.resourceGroupForDB }} \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/testWlsVmCluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ jobs:
--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 }} \
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<properties>
<!-- versions start -->
<!-- weblogic azure aks versions -->
<version.wls-on-aks-azure-marketplace>1.0.72</version.wls-on-aks-azure-marketplace>
<version.wls-on-aks-azure-marketplace>1.0.74</version.wls-on-aks-azure-marketplace>
<!-- weblogic azure vm versions -->
<version.arm-oraclelinux-wls>1.0.27</version.arm-oraclelinux-wls>
<version.arm-oraclelinux-wls-admin>1.0.50</version.arm-oraclelinux-wls-admin>
<version.arm-oraclelinux-wls-cluster>1.0.650000</version.arm-oraclelinux-wls-cluster>
<version.arm-oraclelinux-wls-cluster>1.0.660000</version.arm-oraclelinux-wls-cluster>
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.49</version.arm-oraclelinux-wls-dynamic-cluster>
<!-- node versions -->
<version.arm-oraclelinux-wls-dynamic-cluster-addnode>1.0.7</version.arm-oraclelinux-wls-dynamic-cluster-addnode>
Expand Down
2 changes: 1 addition & 1 deletion resources/azure-common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ azure.apiVersionForStorageFileService=2023-01-01
# AzureAzCLI version
azure.cli.version=2.53.0
# AzurePowerShell version
azure.powershell.version=8.3
azure.powershell.version=11.5
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ module uamiDeployment 'modules/_uamiAndRoles.bicep' = {
* Deploy ACR
*/
module preAzureResourceDeployment './modules/_preDeployedAzureResources.bicep' = {
name: 'pre-azure-resources-deployment'
name: 'prerequisite-resources-deployment'
params: {
acrName: acrName
acrResourceGroupName: acrResourceGroupName
Expand Down