Submit new ARM VM sizes and fix pipeline failure (#335)

* fix pipeline.

* increase pom

* Update ARM VM sizes (#3)

* Increment pom due to other outstanding PR.

---------

Co-authored-by: Ed Burns <[email protected]>

Author: galiacheng

.github/workflows/checkARMVMSize.yml

@@ -17,12 +17,10 @@ jobs:
     if: github.event_name == 'workflow_dispatch' || (github.event_name == 'schedule' && github.repository_owner == 'azure-javaee')
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout oracle/weblogic-azure:main
+    - name: Checkout weblogic-azure
       uses: actions/checkout@v2
       with:
-        repository: oracle/${{ env.repoName }}
-        ref: main
-        path: ${{ env.repoName }}
+        path: weblogic-azure
 
     - uses: azure/login@v1
       id: azure-login
@@ -55,7 +53,7 @@ jobs:
         # Print the extracted value
         echo "$vm_size_list"
 
-        latest_locations=$(az account list-locations --query '[].name' -o tsv)
+        latest_locations=$(az account list-locations --query '[?not_null(metadata.latitude)] .name' -o tsv)
 
         new_sizes=""
         for location in $latest_locations; do

pom.xml

@@ -40,7 +40,7 @@
     <properties>    
         <!--  versions  start -->
         <!--  weblogic azure aks versions  -->
-        <version.wls-on-aks-azure-marketplace>1.0.83</version.wls-on-aks-azure-marketplace>
+        <version.wls-on-aks-azure-marketplace>1.0.86</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
         <version.arm-oraclelinux-wls>1.0.29</version.arm-oraclelinux-wls>
         <version.arm-oraclelinux-wls-admin>1.0.54</version.arm-oraclelinux-wls-admin>

resources/azure-common.properties

@@ -73,4 +73,4 @@ identifier.userAssignedIdentities=Microsoft.ManagedIdentity/userAssignedIdentiti
 identifier.resourcesDeployment=Microsoft resources deployment
 label.tagsLabel=Tags for the resources.
 
-azure.armBased.vmSize.list="Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2"
+azure.armBased.vmSize.list="Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2","Standard_D2pls_v6","Standard_D4pls_v6","Standard_D8pls_v6","Standard_D16pls_v6","Standard_D32pls_v6","Standard_D48pls_v6","Standard_D64pls_v6","Standard_D96pls_v6","Standard_D2pds_v6","Standard_D4pds_v6","Standard_D8pds_v6","Standard_D16pds_v6","Standard_D32pds_v6","Standard_D48pds_v6","Standard_D64pds_v6","Standard_D96pds_v6","Standard_D2plds_v6","Standard_D4plds_v6","Standard_D8plds_v6","Standard_D16plds_v6","Standard_D32plds_v6","Standard_D48plds_v6","Standard_D64plds_v6","Standard_D96plds_v6","Standard_D2ps_v6","Standard_D4ps_v6","Standard_D8ps_v6","Standard_D16ps_v6","Standard_D32ps_v6","Standard_D48ps_v6","Standard_D64ps_v6","Standard_D96ps_v6","Standard_E2ps_v6","Standard_E4ps_v6","Standard_E8ps_v6","Standard_E16ps_v6","Standard_E32ps_v6","Standard_E48ps_v6","Standard_E64ps_v6","Standard_E96ps_v6","Standard_E2pds_v6","Standard_E4pds_v6","Standard_E8pds_v6","Standard_E16pds_v6","Standard_E32pds_v6","Standard_E48pds_v6","Standard_E64pds_v6","Standard_E96pds_v6"

weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-services.sh

@@ -1,39 +1,39 @@
-#!/bin/bash
-# Copyright (c) 2021, Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-# Verify the service using systemctl status
-function verifyServiceStatus()
-{
-  serviceName=$1
-  systemctl status $serviceName | grep "active (running)"    
-  if [[ $? != 0 ]]; then
-     echo "$serviceName is not in active (running) state"
-     exit 1
-  fi
-  echo "$serviceName is active (running)"
-}
-
-#Verify the service using systemctl is-active
-function verifyServiceActive()
-{
-  serviceName=$1
-  state=$(systemctl is-active $serviceName)
-  if [[ $state == "active" ]]; then
-     echo "$serviceName is active"
-  else
-     echo "$serviceName is not active"
-     exit 1
-  fi
-}
-
-echo "Testing on admin server"
-servicesList="rngd wls_admin"
-
-for service in $servicesList
-do
-   verifyServiceStatus $service
-   verifyServiceActive $service
-done
-
-exit 0
+#!/bin/bash
+# Copyright (c) 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Verify the service using systemctl status
+function verifyServiceStatus()
+{
+  serviceName=$1
+  systemctl status $serviceName | grep "active (running)"    
+  if [[ $? != 0 ]]; then
+     echo "$serviceName is not in active (running) state"
+     exit 1
+  fi
+  echo "$serviceName is active (running)"
+}
+
+#Verify the service using systemctl is-active
+function verifyServiceActive()
+{
+  serviceName=$1
+  state=$(systemctl is-active $serviceName)
+  if [[ $state == "active" ]]; then
+     echo "$serviceName is active"
+  else
+     echo "$serviceName is not active"
+     exit 1
+  fi
+}
+
+echo "Testing on admin server"
+servicesList="rngd wls_admin"
+
+for service in $servicesList
+do
+   verifyServiceStatus $service
+   verifyServiceActive $service
+done
+
+exit 0

weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-path.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-# Copyright (c) 2021, Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-echo "#adminPasswordOrKey#" | sudo -S [ -d "/u01/app/wls/install/oracle/middleware/oracle_home/wlserver/modules" ] && exit 0
-exit 1
+#!/bin/bash
+# Copyright (c) 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+echo "#adminPasswordOrKey#" | sudo -S [ -d "/u01/app/wls/install/oracle/middleware/oracle_home/wlserver/modules" ] && exit 0
+exit 1