Merge ~chad.smith/server-team-ci:install-ci-deps into server-team-ci:master

Proposed by Chad Smith
Status: Merged
Merge reported by: Joshua Powers
Merged at revision: 7bb59d8f983428ed2da0cccb5c2b377e2a8381ec
Proposed branch: ~chad.smith/server-team-ci:install-ci-deps
Merge into: server-team-ci:master
Diff against target: 49 lines (+5/-1)
2 files modified
jenkins/cloud-init/centos.yaml (+1/-1)
jenkins/cloud-init/integration.yaml (+4/-0)
Reviewer Review Type Date Requested Status
Joshua Powers Approve
Review via email: mp+325745@code.launchpad.net

Description of the change

Deps fixes: use run-centos --artifacts to spin up an lxc sorting dependencies when building an srpm

This branch does two things for dependency resolution:
  1. use run-centos which spins up a new lxc with all build dependencies installed so we don't run into missing deps when generating CentOS rpms
  2. Call cloud-init's ./tools/read-dependencies --test-distro which installs all the necessary dependencies on our ci server when building ubuntu debs

With these changes we will be able to better manage dependency changes just in cloud-init/*requirements.txt and tools/read-dependencies and we will no longer have to go to the jenkins server to install those deps for us.

To post a comment you must log in.
7bb59d8... by Chad Smith

use sudo as we need that to install pkgs

Revision history for this message
Chad Smith (chad.smith) wrote :
Revision history for this message
Chad Smith (chad.smith) wrote :

Ran 2nd validation that calling sudo read-dependencies script from integration tests doesn't break anything
https://jenkins.ubuntu.com/server/job/z_integration_y/1/console

Revision history for this message
Joshua Powers (powersj) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jenkins/cloud-init/centos.yaml b/jenkins/cloud-init/centos.yaml
2index 06b6d97..174c2eb 100644
3--- a/jenkins/cloud-init/centos.yaml
4+++ b/jenkins/cloud-init/centos.yaml
5@@ -70,7 +70,7 @@
6 git clone https://git.launchpad.net/cloud-init
7 cd cloud-init
8 export PYVER=python2
9- make srpm
10+ ./tools/run-centos 6 --srpm --artifact
11
12 cd "$WORKSPACE"
13 git clone https://git.launchpad.net/server-team-ci
14diff --git a/jenkins/cloud-init/integration.yaml b/jenkins/cloud-init/integration.yaml
15index 6e8ab58..9b4ce51 100644
16--- a/jenkins/cloud-init/integration.yaml
17+++ b/jenkins/cloud-init/integration.yaml
18@@ -37,6 +37,7 @@
19 sudo rm -Rf cloud-init cloud-init-build
20 git clone https://git.launchpad.net/cloud-init
21 cd cloud-init
22+ sudo python3 ./tools/read-dependencies --distro ubuntu --test-distro
23 ./packages/bddeb -S
24 sbuild --nolog --dist=xenial cloud-init_*.dsc
25 tox -e citest -- run --os-name xenial \
26@@ -63,6 +64,7 @@
27 sudo rm -Rf cloud-init cloud-init-build
28 git clone https://git.launchpad.net/cloud-init
29 cd cloud-init
30+ sudo python3 ./tools/read-dependencies --distro ubuntu --test-distro
31 ./packages/bddeb -S
32 sbuild --nolog --dist=yakkety cloud-init_*.dsc
33 tox -e citest -- run --os-name yakkety \
34@@ -89,6 +91,7 @@
35 sudo rm -Rf cloud-init cloud-init-build
36 git clone https://git.launchpad.net/cloud-init
37 cd cloud-init
38+ sudo python3 ./tools/read-dependencies --distro ubuntu --test-distro
39 ./packages/bddeb -S
40 sbuild --nolog --dist=zesty cloud-init_*.dsc
41 tox -e citest -- run --os-name zesty \
42@@ -112,6 +115,7 @@
43 sudo rm -Rf cloud-init cloud-init-build
44 git clone https://git.launchpad.net/cloud-init
45 cd cloud-init
46+ sudo python3 ./tools/read-dependencies --distro ubuntu --test-distro
47 ./packages/bddeb -S
48 sbuild --nolog --dist=artful cloud-init_*.dsc
49 tox -e citest -- run --os-name artful \

Subscribers

People subscribed via source and target branches

to all changes: