Merge remote-tracking branch 'origin/ubuntu' into gpu

Former-commit-id: aeac749e

.gitlab-ci.yml

@@ -13,6 +13,7 @@ stages:
   - ansible_create_cluster_stage
   - push_button_spawn_cluster
   - tests
+
   - integration_test #https://docs.gitlab.com/ee/ci/triggers/
   - clean
   
@@ -70,7 +71,6 @@ ansiblelint:
     - cd CICD
     - python3 ansiblelint/run_lint.py --targets master_playbook.yml
     
-
 build_cluster_cicd:
   stage: heat
   allow_failure: false
@@ -189,7 +189,7 @@ manual_cluster_spawn:
   only:
     refs:
       - "cicd"
-  
+
 clean:
   stage: clean
   tags:
@@ -228,3 +228,11 @@ clean:
 #   after_script:
 #     - sleep 20 # artifically wait a bit to make sure it is really dead
 
+#     - openstack stack list
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh update $HEAT_TEST_STACKNAME
+#     - openstack stack list
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $HEAT_TEST_STACKNAME
+#     - openstack stack list
+#   after_script:
+#     - sleep 20 # artifically wait a bit to make sure it is really dead
+

CICD/heat/gc_HOT.yaml

@@ -380,7 +380,7 @@ resources:
       image: { get_param: ubuntu_1804_image_id }
       key_name: { get_param: ssh_key }
       name:
-       list_join: [ '-', [ { get_param: "OS::stack_name" }, 'computec%index%' ]]
+       list_join: [ '-', [ { get_param: "OS::stack_name" }, 'computec7%index%' ]]
       security_groups: [ default, { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: NFSSecGroup } ]
       metadata:
        ansible_host_groups: [ ComputeNodes ]
@@ -413,7 +413,7 @@ resources:
   UbuntuDesktopNodes:
    type: "OS::Heat::ResourceGroup"
    properties:
-    count: 0
+    count: 1
     resource_def:
      type: "OS::Nova::Server"
      properties: