aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-08-12 10:25:29 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-08-12 09:57:37 +0000
commit1ef537d65d95ccaf46190f043431385bd1df8b6b (patch)
treee138a32ca89b8f67cf4f54bc3059598bbb789d90
parent6319bc6f559ab5c49a7ad701b606b58af62337b0 (diff)
downloadkolla-1ef537d65d95ccaf46190f043431385bd1df8b6b.tar.gz
kolla-1ef537d65d95ccaf46190f043431385bd1df8b6b.zip
[CI] Add no-infra-wheels jobs
Since Kolla is run in the wild against PyPI mirrors which do not include the OpenDev-provided wheels, it might be nice to be able to test these scenarios in the CI. These jobs are added to the experimental queue so that they do not consume resources when not needed. Any Gerrit user may run them now to verify whether the change passes them. Change-Id: I9c33eeaf03be037651f82c831f0e07ab9a27752a
-rw-r--r--.zuul.d/base.yaml6
-rw-r--r--.zuul.d/centos.yaml11
-rw-r--r--.zuul.d/debian.yaml11
-rw-r--r--.zuul.d/ubuntu.yaml11
-rw-r--r--tests/templates/template_overrides.j22
5 files changed, 41 insertions, 0 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index e7ed3e5ff..5a0dd9c15 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -90,3 +90,9 @@
kolla_logs_dir: "{{ zuul_output_dir }}/logs/kolla"
kolla_build_logs_dir: "{{ kolla_logs_dir }}/build"
virtualenv_path: "/tmp/kolla-virtualenv"
+
+- job:
+ name: kolla-build-no-infra-wheels-base
+ parent: kolla-base
+ vars:
+ use_infra_wheels_mirror: false
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 24e90ce33..2796e4436 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -57,6 +57,9 @@
jobs:
- kolla-publish-centos8-source
- kolla-publish-centos8-binary
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-centos8-source
- job:
name: kolla-build-centos8-binary
@@ -98,3 +101,11 @@
publisher: true
secrets:
- kolla_dockerhub_creds
+
+- job:
+ name: kolla-build-no-infra-wheels-centos8-source
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-centos8
+ vars:
+ base_distro: centos
+ install_type: source
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index a6efe4de8..f84bd867a 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -18,6 +18,9 @@
- kolla-publish-debian-source
- kolla-publish-debian-source-aarch64
- kolla-publish-debian-binary
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-debian-source
- job:
name: kolla-build-debian-source
@@ -64,3 +67,11 @@
name: kolla-publish-debian-source-aarch64
parent: kolla-publish-debian-source
nodeset: kolla-debian-buster-aarch64
+
+- job:
+ name: kolla-build-no-infra-wheels-debian-source
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-debian-buster
+ vars:
+ base_distro: debian
+ install_type: source
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index 92213a08f..636b1ad2f 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -79,6 +79,9 @@
jobs:
- kolla-publish-ubuntu-source
- kolla-publish-ubuntu-binary
+ experimental:
+ jobs:
+ - kolla-build-no-infra-wheels-ubuntu-source
- job:
name: kolla-build-ubuntu-binary
@@ -120,3 +123,11 @@
publisher: true
secrets:
- kolla_dockerhub_creds
+
+- job:
+ name: kolla-build-no-infra-wheels-ubuntu-source
+ parent: kolla-build-no-infra-wheels-base
+ nodeset: kolla-ubuntu-focal
+ vars:
+ base_distro: ubuntu
+ install_type: source
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 84b0729fe..480f53337 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -6,7 +6,9 @@
ENV PIP_INDEX_URL {{ nodepool_pypi_mirror }}
ENV PIP_TRUSTED_HOST {{ nodepool_mirror_host }}
+{% if use_infra_wheels_mirror | default(true) %}
ENV PIP_EXTRA_INDEX_URL {{ nodepool_wheel_mirror }}
+{% endif %}
RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
&& mkdir -p /usr/etc \