From 659ed4f61d5041f22e5dcf6cc45ac6f2f6762797 Mon Sep 17 00:00:00 2001
From: Will Holland <william.holland@codethink.co.uk>
Date: Fri, 23 Oct 2015 09:59:41 +0100
Subject: Rename cluster used for ciat testing

---
 builder_logic.py           |  2 +-
 ciat-test-cluster.morph    | 13 +++++++++++++
 deploy_logic.py            |  5 +++--
 tlsa.morph                 | 13 -------------
 triggers/deploy_trigger.sh |  4 ++--
 5 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 ciat-test-cluster.morph
 delete mode 100644 tlsa.morph

diff --git a/builder_logic.py b/builder_logic.py
index dc5c4f0..2bad5a6 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -11,7 +11,7 @@ BUILDSLAVE_SCRIPTS_REPO = 'ssh://git@git.baserock.org/baserock/ciat/buildslave-s
 
 whitelist = [
         DEFAULT_SYSTEM,
-        'clusters/tlsa.morph',
+        'clusters/ciat-test-cluster.morph',
         'strata/build-essential.morph',
         'strata/core.morph',
         'strata/foundation.morph',
diff --git a/ciat-test-cluster.morph b/ciat-test-cluster.morph
new file mode 100644
index 0000000..33eca69
--- /dev/null
+++ b/ciat-test-cluster.morph
@@ -0,0 +1,13 @@
+name: ciat-test-cluster
+kind: cluster
+description: |
+  Test for CIAT, with test on OpenStack
+systems:
+- morph: systems/genivi-demo-platform-x86_64-generic.morph
+  deploy:
+    ciat-test-x86_64:
+      type: extensions/rawdisk
+      location: /archive/ciat-test-x86_64.raw
+      DISK_SIZE: 6G
+      ROOT_DEVICE: /dev/vda
+      INSTALL_FILES: install-files/ciat/manifest
diff --git a/deploy_logic.py b/deploy_logic.py
index ffa02a7..7a01459 100644
--- a/deploy_logic.py
+++ b/deploy_logic.py
@@ -7,7 +7,7 @@ DEFINITIONS_DIR='definitions'
 REF = "cu010-trove/br6/firehose-test-1"
 
 whitelist = [
-        'clusters/tlsa.morph',
+        'clusters/ciat-test-cluster.morph',
         'systems/base-system-x86_64-generic.morph',
         'strata/build-essential.morph',
         'strata/core.morph',
@@ -62,6 +62,7 @@ if __name__ == '__main__':
     buildslave_scripts_sha = sys.argv[4]
     definitions_sha = sys.argv[5]
     pipeline = sys.argv[6]
-    deploy_exit_val = deploy('clusters/tlsa.morph')
+    # TODO the cluster should not be hardcoded
+    deploy_exit_val = deploy('clusters/ciat-test-cluster.morph')
     if deploy_exit_val: _exit(deploy_exit_val)
     _exit(trigger_testing(artefact,pipeline))
diff --git a/tlsa.morph b/tlsa.morph
deleted file mode 100644
index e9732f0..0000000
--- a/tlsa.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: tlsa
-kind: cluster
-description: |
-  tlsa's test for CIAT, with test on OpenStack
-systems:
-- morph: systems/genivi-demo-platform-x86_64-generic.morph
-  deploy:
-    tlsa-ciat-test-x86_64:
-      type: extensions/rawdisk
-      location: /archive/ARTEFACT.raw
-      DISK_SIZE: 6G
-      ROOT_DEVICE: /dev/vda
-      INSTALL_FILES: install-files/ciat/manifest
diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh
index 1d354ab..6f33d67 100644
--- a/triggers/deploy_trigger.sh
+++ b/triggers/deploy_trigger.sh
@@ -5,9 +5,9 @@ BUILDSLAVE_SCRIPTS_SHA=$3
 DEFINITIONS_SHA=$4
 TESTING_SHA=$5
 PIPELINE="$6"
-ARTEFACT="tlsa-ciat-test-x86_64_$BUILDNUMBER"
+ARTEFACT="ciat-test-x86_64_$BUILDNUMBER"
 echo "[$(date "+%F %R")] Deploy triggered with system $SYSTEM." >> ../../../../trigger_log
-sed "s/ARTEFACT/$ARTEFACT/" tlsa.morph > definitions/clusters/tlsa.morph
+sed "s/ARTEFACT/$ARTEFACT/" ciat-test-cluster.morph > definitions/clusters/ciat-test-cluster.morph
 git checkout $BUILDSLAVE_SCRIPTS_SHA
 if [ -d ybd-env ]; then
     rm -rf ybd-env
-- 
cgit v1.2.1