QA Jenkins Jobs

Merge lp:~xnox/qa-jenkins-jobs/enable-per-arch-xml into lp:qa-jenkins-jobs

  1. enable-per-arch-xml
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 342
Proposed branch: lp:~xnox/qa-jenkins-jobs/enable-per-arch-xml
Merge into: lp:qa-jenkins-jobs
Diff against target: 24 lines (+13/-1)
1 file modified
scripts/iso-testing/run-iso-test.sh (+13/-1)
To merge this branch: bzr merge lp:~xnox/qa-jenkins-jobs/enable-per-arch-xml
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+365357@code.launchpad.net

Commit message

Allow using per-arch xml template in run-iso-test.sh, just like in carbon-copy cmds in jobs-ppc64el.yaml.

Description of the change

Allow using per-arch xml template in run-iso-test.sh, just like in carbon-copy cmds in jobs-ppc64el.yaml.

To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

LGTM. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/iso-testing/run-iso-test.sh'
2--- scripts/iso-testing/run-iso-test.sh 2019-03-28 16:14:35 +0000
3+++ scripts/iso-testing/run-iso-test.sh 2019-04-01 15:11:27 +0000
4@@ -115,7 +115,19 @@
5 EOF
6 fi
7
8-sudo -u utah -i UTAH_CONFIG_DIR=$UTAH_CONFIG_DIR $($cmd) -f /var/log/installer -x /etc/utah/bridged-network-vm.xml --outputpreseed > $LOG_DIR/utah-server-stdout.log
9+case $arch in
10+ ppc64le)
11+ xml=default-vm-ppc64.xml
12+ ;;
13+ s390x)
14+ xml=default-vm-s390x.xml
15+ ;;
16+ *)
17+ xml=bridged-network-vm.xml
18+ ;;
19+esac
20+
21+sudo -u utah -i UTAH_CONFIG_DIR=$UTAH_CONFIG_DIR $($cmd) -f /var/log/installer -x /etc/utah/$xml --outputpreseed > $LOG_DIR/utah-server-stdout.log
22 RETCODE=$?
23
24 [ ! -z "$machine_name" ] && sudo chmod 777 "$SHARED_IMG_PATH"/"$machine_name"/disk0.qcow2

Subscribers

People subscribed via source and target branches