Browse Source

Build OpenSUSE Leap 15 by default

This includes the building of OpenSUSE Leap 15 in checks/gates.

As the build of each project requires the building of the
requirements first, added to the fact that a new distro is added
into the jobs, this extends the timeout for the base job beyond
the maximum time for requirements, so that all the projects
(excluding requirements) have more time to complete.

Change-Id: I73b055b3942a6d80b8474544a9d65df0b3005e15
Jean-Philippe Evrard 6 months ago
parent
commit
f78e45c304
3 changed files with 26 additions and 1 deletions
  1. 1
    1
      .zuul.d/base.yaml
  2. 10
    0
      dockerfiles/leap15/Dockerfile
  3. 15
    0
      playbooks/vars.yaml

+ 1
- 1
.zuul.d/base.yaml View File

@@ -3,4 +3,4 @@
3 3
     pre-run: playbooks/setup-gate.yaml
4 4
     run: playbooks/loci-builder.yaml
5 5
     post-run: playbooks/post.yaml
6
-    timeout: 1200
6
+    timeout: 3600

+ 10
- 0
dockerfiles/leap15/Dockerfile View File

@@ -0,0 +1,10 @@
1
+ARG FROM=opensuse/leap:15
2
+FROM ${FROM}
3
+
4
+ARG PACKAGE_MIRROR=http://download.opensuse.org/
5
+ARG PIP_INDEX_URL=https://pypi.python.org/simple/
6
+ARG PIP_TRUSTED_HOST=pypi.python.org
7
+ENV PIP_INDEX_URL=${PIP_INDEX_URL}
8
+ENV PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
9
+
10
+RUN for filename in $(grep -Rl enabled=1 /etc/zypp/repos.d/); do sed -i "s|http://download.opensuse.org/|${PACKAGE_MIRROR}|" $filename; done && zypper refresh && zypper up -y && zypper install -y tar gzip which unzip

+ 15
- 0
playbooks/vars.yaml View File

@@ -51,6 +51,21 @@ distros:
51 51
         PROJECT: requirements
52 52
         PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
53 53
         FROM: base:ubuntu
54
+  - name: leap15
55
+    buildargs:
56
+      base:
57
+        PACKAGE_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/opensuse/"
58
+        PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple
59
+        PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}"
60
+      project:
61
+        PROJECT: "{{ project }}"
62
+        PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
63
+        WHEELS: 172.17.0.1:5000/loci/requirements:{{ branch }}-leap15
64
+        FROM: base:leap15
65
+      requirements:
66
+        PROJECT: requirements
67
+        PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
68
+        FROM: base:leap15
54 69
 #  - name: debian
55 70
 #    image: debian:stretch
56 71
 #    buildargs:

Loading…
Cancel
Save