canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+487955@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging qa-jenkins-jobs:ubuntu-test-cases-bzr-2-git into qa-jenkins-jobs:master.

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/487955

changes following migration of https://code.launchpad.net/ubuntu-test-cases from bzr to git
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of qa-jenkins-jobs:ubuntu-test-cases-bzr-2-git into qa-jenkins-jobs:master.

diff --git a/jobs/iso-testing/jobs-server.yaml b/jobs/iso-testing/jobs-server.yaml
index d622589..301d4e0 100644
--- a/jobs/iso-testing/jobs-server.yaml
+++ b/jobs/iso-testing/jobs-server.yaml
@@ -316,7 +316,7 @@
 
             set -x
 
-            retry -t 3 -d 180 -- bzr export scripts lp:ubuntu-test-cases/{variant}/scripts || exit 1
+            retry -t 3 -d 180 -- git clone -b bzr-import-{variant} https://git.launchpad.net/ubuntu-test-cases || exit 1
 
             # Create custom configuration file and separate per-job log files
             export UTAH_CONFIG_DIR="$WORKSPACE/config"
@@ -349,7 +349,7 @@
             [[ -z "$ARCHVARIANT" || "$ARCHVARIANT" = default ]] || xml="$xml-$ARCHVARIANT"
             xml="$xml.xml"
 
-            sudo -u utah UTAH_CONFIG_DIR="$UTAH_CONFIG_DIR" -- $(scripts/{test}.sh -i "$iso") -f /var/log/installer -x "/etc/utah/$xml" --outputpreseed > "$LOG_DIR/utah-server-stdout.log"
+            sudo -u utah UTAH_CONFIG_DIR="$UTAH_CONFIG_DIR" -- $(ubuntu-test-cases/scripts/{test}.sh -i "$iso") -f /var/log/installer -x "/etc/utah/$xml" --outputpreseed > "$LOG_DIR/utah-server-stdout.log"
             RETCODE=$?
 
             # Retake ownership of the files created with sudo
diff --git a/scripts/iso-testing/run-iso-test.sh b/scripts/iso-testing/run-iso-test.sh
index 5b5025e..e751665 100755
--- a/scripts/iso-testing/run-iso-test.sh
+++ b/scripts/iso-testing/run-iso-test.sh
@@ -86,10 +86,10 @@ fi
 cd "$WORKSPACE" || exit
 
 #TODO: Packaging for this?
-bzr export scripts lp:ubuntu-test-cases/"$variant"/scripts
+retry -t 3 -d 180 -- git clone -b bzr-import-"$variant" https://git.launchpad.net/ubuntu-test-cases
 # replace the autoinstall configuration for the new installer
 if [ "$desktop_replace_autoinstall" = true ]; then
-    sed -i s#\.cfg#\.yaml#g scripts/*.sh
+    sed -i s#\.cfg#\.yaml#g ubuntu-test-cases/scripts/*.sh
 fi
 
 export SHARED_IMG_PATH=/var/lib/utah/vm
@@ -118,9 +118,9 @@ for file in "$UTAH_LOG_FILE" "$UTAH_DEBUGLOG_FILE" "$UTAH_SSH_LOG_FILE"; do
 done
 
 if [ -n "$iso" ]; then
-    cmd="./scripts/$test.sh -i $iso"
+    cmd="./ubuntu-test-cases/scripts/$test.sh -i $iso"
 else
-    cmd="./scripts/$test.sh -i /var/cache/utah/iso/$isoname"
+    cmd="./ubuntu-test-cases/scripts/$test.sh -i /var/cache/utah/iso/$isoname"
 fi
 
 if [ -n "$machine_prefix" ] ; then