diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-10-23 09:59:41 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-10-23 09:59:41 +0100 |
| commit | 659ed4f61d5041f22e5dcf6cc45ac6f2f6762797 (patch) | |
| tree | bb16e9a270df1c6f8f3dd2fb0bc2d9f3d00e6301 | |
| parent | 9c416a7eb0e86f7797538e96d99db8b641786b38 (diff) | |
| download | buildslave-scripts-659ed4f61d5041f22e5dcf6cc45ac6f2f6762797.tar.gz | |
Rename cluster used for ciat testing
| -rw-r--r-- | builder_logic.py | 2 | ||||
| -rw-r--r-- | ciat-test-cluster.morph (renamed from tlsa.morph) | 8 | ||||
| -rw-r--r-- | deploy_logic.py | 5 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 4 |
4 files changed, 10 insertions, 9 deletions
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/tlsa.morph b/ciat-test-cluster.morph index e9732f0..33eca69 100644 --- a/tlsa.morph +++ b/ciat-test-cluster.morph @@ -1,13 +1,13 @@ -name: tlsa +name: ciat-test-cluster kind: cluster description: | - tlsa's test for CIAT, with test on OpenStack + Test for CIAT, with test on OpenStack systems: - morph: systems/genivi-demo-platform-x86_64-generic.morph deploy: - tlsa-ciat-test-x86_64: + ciat-test-x86_64: type: extensions/rawdisk - location: /archive/ARTEFACT.raw + 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/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 |