Merge lp:~canonical-platform-qa/qa-jenkins-jobs/ust-no-debs into lp:qa-jenkins-jobs

Proposed by Allan LeSage
Status: Work in progress
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/ust-no-debs
Merge into: lp:qa-jenkins-jobs
Diff against target: 112 lines (+70/-8)
4 files modified
jobs/ubuntu-system-tests/ci-flake8-builder.sh (+11/-0)
jobs/ubuntu-system-tests/ci-jobs.yaml (+38/-8)
jobs/ubuntu-system-tests/ci-selftests-builder.sh (+14/-0)
jobs/ubuntu-system-tests/ci-setup-builder.sh (+7/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/ust-no-debs
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Heber Parrucci Pending
Santiago Baldassin Pending
Max Brustkern Pending
Review via email: mp+312956@code.launchpad.net

Commit message

Don't build debs for ust CI.

Description of the change

Hey so here's Santiago's and Heber's changes to the ust CI expressed as a qa-jenkins-job, the new job is now just an edit to the old one.

I confess that I haven't tested this fully, I'll leave this to you as an exercise ;) , having added a lot of tutorial detail to https://wiki.canonical.com/UbuntuEngineering/QA/JenkinsJobs .

I want to emphasize that I think it's better just to build the debs. It's kind-of the point of CI to prevent archive breakage--if this is a package (it has a debian dir) then it shouldn't FTBFS.

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

Unmerged revisions

194. By Allan LeSage

Get sbalda's and heber's changes into a job, add krillin testing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'jobs/ubuntu-system-tests/ci-flake8-builder.sh'
2--- jobs/ubuntu-system-tests/ci-flake8-builder.sh 1970-01-01 00:00:00 +0000
3+++ jobs/ubuntu-system-tests/ci-flake8-builder.sh 2016-12-09 23:56:05 +0000
4@@ -0,0 +1,11 @@
5+cd ubuntu-system-tests
6+
7+./run_flake8 https://squid.internal:3128/
8+
9+rm -rf venv_tests/
10+if [ -s flake8_output.txt ]; then
11+ cd $WORKSPACE
12+ rm build_results.properties
13+ echo ci_result="FAILED" > build_results.properties
14+ exit 1
15+fi
16
17=== modified file 'jobs/ubuntu-system-tests/ci-jobs.yaml'
18--- jobs/ubuntu-system-tests/ci-jobs.yaml 2016-09-09 19:33:27 +0000
19+++ jobs/ubuntu-system-tests/ci-jobs.yaml 2016-12-09 23:56:05 +0000
20@@ -35,19 +35,31 @@
21 # This token is the string that was setup for the launchpad bot.
22 auth-token: BUILD_ME
23 concurrent: true
24+ wrappers:
25+ - timeout:
26+ timeout: 5
27+ fail: true
28 builders:
29- - trigger-deb-builders:
30- landing_candidate: {landing_candidate}
31- target_branch: 'lp:ubuntu-system-tests'
32- hooks: 'H05set_package_version H10strip_native_depends D09add_ppa~canonical-platform-qa~ppa'
33- parallelism: 1
34+ # when we return to our senses we'll build these debs again!
35+ # - trigger-deb-builders:
36+ # landing_candidate: {landing_candidate}
37+ # target_branch: 'lp:ubuntu-system-tests'
38+ # hooks: 'H05set_package_version H10strip_native_depends D09add_ppa~canonical-platform-qa~ppa'
39+ # parallelism: 1
40+ - ci-setup-builder
41+ - ci-flake8-builder
42+ - ci-selftests-builder
43 - trigger-ust-pre-builder
44 - trigger-ust-builder
45- - upcopy-i386-from-downstream
46- - upcopy-amd64-from-downstream
47+ # when we return to our senses we'll upcopy these debs again!
48+ # - upcopy-i386-from-downstream
49+ # - upcopy-amd64-from-downstream
50 - trigger-generic-update-mp
51 publishers:
52- - collect-debs
53+ # when we return to our senses we'll collect these debs again!
54+ # - collect-debs
55+ - archive:
56+ artifacts: 'ubuntu-system-tests/flake8_output.txt'
57 - trigger-generic-update-mp-failed
58 parameters:
59 - string:
60@@ -109,3 +121,21 @@
61 - 'ust-ci-krillin'
62 block: true
63 property-file: $WORKSPACE/ust-parameters.txt
64+
65+- builder:
66+ name: ci-setup-builder
67+ builders:
68+ - shell:
69+ !include-raw: ci-setup-builder.sh
70+
71+- builder:
72+ name: ci-flake8-builder
73+ builders:
74+ - shell:
75+ !include-raw: ci-flake8-builder.sh
76+
77+- builder:
78+ name: ci-selftests-builder
79+ builders:
80+ - shell:
81+ !include-raw: ci-selftests-builder.sh
82
83=== added file 'jobs/ubuntu-system-tests/ci-selftests-builder.sh'
84--- jobs/ubuntu-system-tests/ci-selftests-builder.sh 1970-01-01 00:00:00 +0000
85+++ jobs/ubuntu-system-tests/ci-selftests-builder.sh 2016-12-09 23:56:05 +0000
86@@ -0,0 +1,14 @@
87+set +e
88+
89+cd ubuntu-system-tests
90+
91+./run_self_tests https://squid.internal:3128/ 3.4
92+rc=$?
93+rm -rf venv_self_tests/
94+
95+if [ $rc != 0 ]; then
96+ cd $WORKSPACE
97+ rm build_results.properties
98+ echo ci_result="FAILED" > build_results.properties
99+ exit 1
100+fi
101
102=== added file 'jobs/ubuntu-system-tests/ci-setup-builder.sh'
103--- jobs/ubuntu-system-tests/ci-setup-builder.sh 1970-01-01 00:00:00 +0000
104+++ jobs/ubuntu-system-tests/ci-setup-builder.sh 2016-12-09 23:56:05 +0000
105@@ -0,0 +1,7 @@
106+rm -f build_results.properties
107+echo ci_result="PASSED" > build_results.properties
108+rm -rf ubuntu-system-tests
109+bzr branch $landing_candidate ubuntu-system-tests
110+cd ubuntu-system-tests
111+bzr merge lp:ubuntu-system-tests
112+

Subscribers

People subscribed via source and target branches