Merge pull request #287 from WASdev/retiredConfig

gen2 fixes

Author: kevin-ortega

.github/resource/azure-credential-setup.sh

@@ -21,7 +21,7 @@ az rest -m POST \
   --body "{\"@odata.id\":\"https://graph.microsoft.com/v1.0/directoryObjects/${SP_ID}\"}"
 
 ## Set the Azure Credentials as a secret in the repository
-gh secret --repo $(gh repo set-default --view) set "AZURE_CREDENTIALS" -b"${AZURE_CREDENTIALS}"
-gh variable --repo $(gh repo set-default --view)  set "AZURE_CREDENTIALS_SP_NAME" -b"${AZURE_CREDENTIALS_SP_NAME}"
+gh secret set "AZURE_CREDENTIALS" -b "${AZURE_CREDENTIALS}"
+gh variable set "AZURE_CREDENTIALS_SP_NAME" -b "${AZURE_CREDENTIALS_SP_NAME}"
 
 echo "Execute $CURRENT_FILE_NAME - End--------------------------------------------"

.github/workflows/integration-test.yaml

@@ -351,7 +351,7 @@ jobs:
             -DuseTrial=${useTrial} \
             -DibmUserId=${ibmUserId} \
             -DibmUserPwd=${ibmUserPwd} \
-            -DnumberOfNodes=3 -DvmSize=Standard_D2_v3 -DdmgrVMPrefix=dmgr -DmanagedVMPrefix=managed -DdnsLabelPrefix=wasndcluster \
+            -DnumberOfNodes=3 -DvmSize=Standard_D2s_v3 -DdmgrVMPrefix=dmgr -DmanagedVMPrefix=managed -DdnsLabelPrefix=wasndcluster \
             -DadminUsername=${{ env.vmAdminId }} -DadminPasswordOrKey=${{ env.vmAdminPassword }} \
             -DauthenticationType=password -DwasUsername=${{ env.vmAdminId }} -DwasPassword=${{ env.vmAdminPassword }} \
             -DselectLoadBalancer=${selectLoadBalancer} -DenableCookieBasedAffinity=true -DihsVmSize=Standard_D2_v3 -DihsVMPrefix=ihs -DihsDnsLabelPrefix=ihs \