Merge pull request #453 from Azure/cycle_79x

added support for CC 79x
Azure · Jan 20, 2021 · baacce8 · baacce8
2 parents 4f4572c + f1ce7ef
commit baacce8
Show file tree

Hide file tree

Showing 6 changed files with 389 additions and 10 deletions.
diff --git a/blocks/cycle-install-server-managed-identity.json b/blocks/cycle-install-server-managed-identity.json
@@ -67,7 +67,7 @@
         "variables.projectstore",
         "variables.cc_version"
       ],
-      "deps": ["cyclecloud8_config.py"]
+      "deps": ["cyclecloud8_config.py", "cyclecloud7_config.py"]
     }
   ]
 }
diff --git a/examples/cycleserver_msi/pipeline.yml b/examples/cycleserver_msi/pipeline.yml
@@ -23,6 +23,7 @@ trigger:
       - blocks/vnet.json
       - scripts/cc_install_managed_identity.sh
       - scripts/cyclecloud8_install.py
+      - scripts/cyclecloud7_install.py
     exclude:
       - examples/cycleserver_msi/readme.md
 
@@ -41,8 +42,8 @@ variables:
   - name: azhpc.script_remote_dest
     value: 'hpcadmin@jumpbox:.'
 
-  # - name: azhpc.variables_matrix
-  #   value: examples/cycleserver_msi/test_matrix.json
+  - name: azhpc.variables_matrix
+    value: examples/cycleserver_msi/test_matrix.json
 # Add the variables needed in your configuration file
 # Set values below or thru pipeline variables
   # - name: azhpc.variables.variable_name

diff --git a/examples/cycleserver_msi/readme.md b/examples/cycleserver_msi/readme.md
@@ -1,7 +1,7 @@
 # Building the infrastructure
 ![Build Status](https://azurecat.visualstudio.com/hpccat/_apis/build/status/azhpc/examples/cycleserver_msi?branchName=master)
 
-Here we will explain how to deploy a full system with a VNET, JUMPBOX, CYCLESERVER 8 by using building blocks.
+Here we will explain how to deploy a full system with a VNET, JUMPBOX, CYCLESERVER 8.1 or 7.9x by using building blocks.
 CycleCloud will be deployed using the azure marketplace image. 
 
 ## Step 1 - install azhpc
@@ -39,8 +39,8 @@ Edit the variables.json to match your environment. Give a unique value to `uuid`
     "key_vault": "kv{{variables.uuid}}",
     "uuid": "unique value",
     "projectstore": "locker{{variables.uuid}}",
-    "cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-81:8.1.0",
-    "cc_version": "8"
+    "cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-81:8.1.0 | azurecyclecloud:azure-cyclecloud:cyclecloud-79x:7.9.8",
+    "cc_version": "8 | 7"
   }
 }
 ```

diff --git a/examples/cycleserver_msi/test_matrix.json b/examples/cycleserver_msi/test_matrix.json
@@ -1,10 +1,12 @@
 {
     "CycleCloud7":
     {
-        "azhpc.variables.cc_version": "7"
+        "azhpc.variables.cc_version": "7",
+        "azhpc.variables.cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-79x:7.9.8"
     },
     "CycleCloud8":
     {
-        "azhpc.variables.cc_version": "8"
+        "azhpc.variables.cc_version": "8",
+        "azhpc.variables.cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-81:8.1.0"
     }
 }
diff --git a/examples/cycleserver_msi/variables.json b/examples/cycleserver_msi/variables.json
@@ -5,7 +5,7 @@
     "key_vault": "kv{{variables.uuid}}",
     "uuid": "unique value",
     "projectstore": "locker{{variables.uuid}}",
-    "cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-81:8.1.0",
-    "cc_version": "8"
+    "cc_image": "azurecyclecloud:azure-cyclecloud:cyclecloud-81:8.1.0 | azurecyclecloud:azure-cyclecloud:cyclecloud-79x:7.9.8",
+    "cc_version": "8 | 7"
   }
 }