From f9c01e0ea4c92ab98ccedd85a23a570f6ca49bf4 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 18 Sep 2015 11:14:28 +0000 Subject: Rever sillyness. --- triggers/testing_trigger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index 62bca03..ccda77c 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -26,4 +26,4 @@ if [ "$TESTING_SHA" != "no_testing_sha_given" ]; then git checkout $TESTING_SHA fi PATH=$PATH:/usr/local/bin -python -u test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test tests/systemd.test tests/baserock-meta.test +test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test tests/systemd.test tests/baserock-meta.test -- cgit v1.2.1 From dd8e88c8f417690bf1a0252ffd7db32e4e65700d Mon Sep 17 00:00:00 2001 From: Will Holland Date: Fri, 18 Sep 2015 13:20:47 +0100 Subject: Fix not being able to update testing repo --- triggers/testing_trigger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index ccda77c..ef5faf1 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -18,7 +18,7 @@ sudo mkdir -p testing sudo chown -R $USER /archive/testing cd /archive/testing if [ -d ciat-tester ]; then - rm -rf ciat-tester + sudo rm -rf ciat-tester fi git clone ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester cd ciat-tester -- cgit v1.2.1 From 125ede1e137ef2eaac640089e231dfe144424b2c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 18 Sep 2015 12:21:36 +0000 Subject: Fix path. --- triggers/testing_trigger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index ef5faf1..ab22926 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -26,4 +26,4 @@ if [ "$TESTING_SHA" != "no_testing_sha_given" ]; then git checkout $TESTING_SHA fi PATH=$PATH:/usr/local/bin -test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test tests/systemd.test tests/baserock-meta.test +./test-runner.sh file:///archive/"$ARTEFACT".raw openstack tests/python.test tests/uname.test tests/systemd.test tests/baserock-meta.test -- cgit v1.2.1 From 8f9c706d90726d38a26a5c18a1b293f6a6fb19f5 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Fri, 18 Sep 2015 13:26:09 +0000 Subject: Make archiving executeable --- archive_an_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 archive_an_image.sh diff --git a/archive_an_image.sh b/archive_an_image.sh old mode 100644 new mode 100755 index aec6c60..7bfc71d --- a/archive_an_image.sh +++ b/archive_an_image.sh @@ -10,5 +10,5 @@ img_date=`date -r "$img_path" +"%y-%m-%d_%H%M"` archive_path="$archive_dir$img_date" mkdir -p "$archive_path" -# Move the img to the archive -mv "$img_path" "$archive_path" +# Move the img to the archive - Copy for now due to tlsa scripts +cp "$img_path" "$archive_path" -- cgit v1.2.1 From fbde4e05e55a3f5ee7507aacbd67a4b033861235 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Fri, 18 Sep 2015 13:34:06 +0000 Subject: Fix the archive path problem. Should work now. --- archive_an_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archive_an_image.sh b/archive_an_image.sh index 7bfc71d..c283057 100755 --- a/archive_an_image.sh +++ b/archive_an_image.sh @@ -7,7 +7,7 @@ archive_dir=/archive/images # Create am archive directory based on the img date img_date=`date -r "$img_path" +"%y-%m-%d_%H%M"` -archive_path="$archive_dir$img_date" +archive_path="$archive_dir/$img_date" mkdir -p "$archive_path" # Move the img to the archive - Copy for now due to tlsa scripts -- cgit v1.2.1 From 9f56c15c8cd90793262f49263df02e24ab37e246 Mon Sep 17 00:00:00 2001 From: Will Holland Date: Fri, 18 Sep 2015 16:05:47 +0100 Subject: Fix double cluster in path --- deploy_a_system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_a_system.sh b/deploy_a_system.sh index 3a16d07..81f1006 100755 --- a/deploy_a_system.sh +++ b/deploy_a_system.sh @@ -22,7 +22,7 @@ sudo modprobe btrfs cd "$definitions_dir" -sudo "$ybd_dir"/ybd.py clusters/"$cluster_name" +sudo "$ybd_dir"/ybd.py "$cluster_name" # Hmm, remove built system artifacts, tar and .unpacked -- cgit v1.2.1