From d5ec4b01162b384b5276b28a93434fac762f0e94 Mon Sep 17 00:00:00 2001
From: Jafar Lie <jafar.lie@monash.edu>
Date: Mon, 9 Mar 2020 15:26:57 +1100
Subject: [PATCH] formatting fix and removed clean state from cicd

---
 .gitlab-ci.yml           | 24 ++++++++++-----------
 roles/gpu/tasks/main.yml | 46 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1656b571..cdb52f32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
   - push_button_spawn_cluster
 #  - e2e
   - tests
-  - clean # manually delete stack
+#  - clean # manually delete stack
 
 
   
@@ -206,15 +206,15 @@ extended:
     variables:
       - $EXTENDED != null
   
-clean:
-  stage: clean
-  tags:
-  - heat
-  before_script:
-    - echo "cleanup stack"
-    - sleep 30
-    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
-  script:
-    - source ./$NECTAR_ALLOCATION-openrc.sh
-    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+#clean:
+#  stage: clean
+#  tags:
+#  - heat
+#  before_script:
+#    - echo "cleanup stack"
+#    - sleep 30
+#    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
+#  script:
+#    - source ./$NECTAR_ALLOCATION-openrc.sh
+#    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
   #when: manual
diff --git a/roles/gpu/tasks/main.yml b/roles/gpu/tasks/main.yml
index f5b66b7f..c2dfdadc 100644
--- a/roles/gpu/tasks/main.yml
+++ b/roles/gpu/tasks/main.yml
@@ -27,6 +27,52 @@
     - xorg-x11-xkb-utils
   when: ansible_os_family == 'RedHat'
 
+- name: install deps 
+  apt: 
+   name: 
+     - 'gcc'
+     - 'perl'
+     - 'wget'
+     - 'pciutils'
+     - 'linux-headers-generic'
+     - 'xterm'
+     - 'libx11-dev'
+     - 'libx11-6'
+     - 'libglvnd-dev'
+     - 'xserver-xorg']state: present
+    update_cache: yes
+  become: true
+  become_user: root
+  when: ansible_distribution == 'Ubuntu'
+
+- name: install deps 
+  yum: name={{ item }} state=installed
+  become: true
+  with_items:
+    - gcc
+    - perl
+    - wget
+    - pciutils
+    - kernel-headers
+    - kernel-devel 
+    - xterm
+    - libX11-common
+    - libX11-devel
+    - libX11
+    - libglvnd-devel
+    - xorg-x11-server-common
+    - xorg-x11-util-macros
+    - xorg-x11-server-utils
+    - xorg-x11-font-utils
+    - xorg-x11-server-Xorg
+    - xorg-x11-glamor
+    - xorg-x11-xinit
+    - xorg-x11-utils
+    - xorg-x11-xauth
+    - xorg-x11-proto-devel
+    - xorg-x11-xkb-utils
+  when: ansible_os_family == 'RedHat'
+
 - name: install development tools
   yum: name="@Development Tools" state=installed
   become: true
-- 
GitLab