QA Jenkins Jobs

Merge lp:~heber013/qa-jenkins-jobs/ust-fixes into lp:qa-jenkins-jobs

  1. ust-fixes
  2. Merge into trunk
Proposed by Heber Parrucci
Status: Merged
Merged at revision: 256
Proposed branch: lp:~heber013/qa-jenkins-jobs/ust-fixes
Merge into: lp:qa-jenkins-jobs
Diff against target: 85 lines (+19/-14)
4 files modified
jobs/ubuntu-system-tests/ci-jobs.yaml (+0/-4)
jobs/ubuntu-system-tests/trigger-ust-pre-builder.sh (+15/-4)
jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh (+3/-5)
scripts/iso-testing/run-iso-test.sh (+1/-1)
To merge this branch: bzr merge lp:~heber013/qa-jenkins-jobs/ust-fixes
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
platform-qa-bot continuous-integration Approve
Review via email: mp+327627@code.launchpad.net

Commit message

Fixes:
* write configs in the correct section
* remove unnecessary tab

Description of the change

Fixes:
* write configs in the correct section
* remove unnecessary tab

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :

PASSED: Continuous integration, rev:255
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/189/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/39
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-amd64-package/39/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/39
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-zesty-i386-package/39/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2371/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/189/rebuild

review: Approve (continuous-integration)
lp:~heber013/qa-jenkins-jobs/ust-fixes updated
256. By Heber Parrucci

fixing proxy in ubuntu-system-test-ci

Revision history for this message
Jean-Baptiste Lallement (jibel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/ubuntu-system-tests/ci-jobs.yaml'
2--- jobs/ubuntu-system-tests/ci-jobs.yaml 2017-07-06 17:45:06 +0000
3+++ jobs/ubuntu-system-tests/ci-jobs.yaml 2017-07-18 17:42:48 +0000
4@@ -49,10 +49,6 @@
5
6 parameters:
7 - string:
8- name: https_proxy
9- description: The https proxy to use
10- default: https://squid.internal:3128
11- - string:
12 name: landing_candidate
13 description: The launchpad branch to process
14 - string:
15
16=== modified file 'jobs/ubuntu-system-tests/trigger-ust-pre-builder.sh'
17--- jobs/ubuntu-system-tests/trigger-ust-pre-builder.sh 2017-07-06 17:45:06 +0000
18+++ jobs/ubuntu-system-tests/trigger-ust-pre-builder.sh 2017-07-18 17:42:48 +0000
19@@ -1,21 +1,32 @@
20 virtualenv -p python venv_temp
21 . venv_temp/bin/activate
22
23-pip install --proxy $https_proxy requests
24-pip install --proxy $https_proxy launchpadlib
25-pip install --proxy $https_proxy simplejson
26+
27+
28+cmd="pip install requests launchpadlib simplejson"
29+
30+if [ -f ~/.proxy_info ] ; then
31+ source ~/.proxy_info
32+ cmd="$cmd --proxy $HTTPS_PROXY"
33+fi
34+
35+$cmd
36
37 QA_JENKINS_JOBS_BRANCH=lp:qa-jenkins-jobs
38 rm -rf qa-jenkins-jobs
39 bzr branch $QA_JENKINS_JOBS_BRANCH qa-jenkins-jobs
40
41+# unset proxy to retrieve TESTS_TO_RUN
42+unset HTTPS_PROXY
43 TESTS_TO_RUN=$(venv_temp/bin/python qa-jenkins-jobs/scripts/ubuntu-system-tests/get_tests_to_run.py -mpu "$merge_proposal" 2>&1)
44 echo $TESTS_TO_RUN
45
46 rm -f ${WORKSPACE}/ust-parameters.txt
47 export PROPERTIES_FILE_PATH=${WORKSPACE}/ust-parameters.txt
48 cat >> $PROPERTIES_FILE_PATH <<EOF
49-TESTS_TO_RUN=$TESTS_TO_RUN
50 UBUNTU_SYSTEM_TESTS_BRANCH=$landing_candidate
51 EOF
52+
53+[ $TEST_TO_RUN ] && echo "TEST_TO_RUN=$TEST_TO_RUN" >> ${WORKSPACE}/ust-parameters.txt
54+
55 cat $PROPERTIES_FILE_PATH
56
57=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh'
58--- jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh 2017-07-06 17:45:06 +0000
59+++ jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh 2017-07-18 17:42:48 +0000
60@@ -7,10 +7,8 @@
61 bzr branch $QA_JENKINS_JOBS_BRANCH qa-jenkins-jobs
62 ./qa-jenkins-jobs/scripts/ubuntu-system-tests/write-ust-config.sh
63
64+sed -i "/$CONFIG_SECTION/a cache_data_path=$CACHE_PATH" $CONFIG_PATH
65+sed -i "/$CONFIG_SECTION/a output_dir=$OUTPUTDIR" $CONFIG_PATH
66+sed -i "/$CONFIG_SECTION/a target_type=qemu" $CONFIG_PATH
67
68-cat >> $CONFIG_PATH <<EOF
69-cache_data_path = $CACHE_PATH
70-output_dir = $OUTPUTDIR
71-target_type = qemu
72-EOF
73 cat $CONFIG_PATH
74
75=== modified file 'scripts/iso-testing/run-iso-test.sh'
76--- scripts/iso-testing/run-iso-test.sh 2017-07-13 18:25:06 +0000
77+++ scripts/iso-testing/run-iso-test.sh 2017-07-18 17:42:48 +0000
78@@ -80,7 +80,7 @@
79 rm -f $WORKSPACE/ust-parameters.txt
80 export PROPERTIES_FILE_PATH=$WORKSPACE/ust-parameters.txt
81 cat >> $PROPERTIES_FILE_PATH <<EOF
82- SHARED_IMG_PATH=$SHARED_IMG_PATH/$machine_name/disk0.qcow2
83+SHARED_IMG_PATH=$SHARED_IMG_PATH/$machine_name/disk0.qcow2
84 EOF
85 fi
86

Subscribers

People subscribed via source and target branches

to all changes: