diff options
| -rw-r--r-- | .zuul.d/centos.yaml | 12 | ||||
| -rw-r--r-- | .zuul.d/oraclelinux.yaml | 8 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 12 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 7 |
5 files changed, 36 insertions, 8 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 98a6d8ab5..93608cc80 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -4,9 +4,15 @@ jobs: - kolla-build-centos-binary - kolla-build-centos-source - - kolla-ansible-centos-source - - kolla-ansible-centos-binary - - kolla-ansible-centos-source-upgrade + - kolla-ansible-centos-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-centos-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-centos-source-upgrade: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - tripleo-build-containers-centos-7: # FIXME(yoctozepto): set to voting when TripleO CI is fixed voting: false diff --git a/.zuul.d/oraclelinux.yaml b/.zuul.d/oraclelinux.yaml index 4f0cd4f35..bbcd9a3db 100644 --- a/.zuul.d/oraclelinux.yaml +++ b/.zuul.d/oraclelinux.yaml @@ -4,8 +4,12 @@ jobs: - kolla-build-oraclelinux-binary - kolla-build-oraclelinux-source - - kolla-ansible-oraclelinux-source - - kolla-ansible-oraclelinux-binary + - kolla-ansible-oraclelinux-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-oraclelinux-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - kolla-ansible-oraclelinux-source-ceph: files: ^docker\/(ceph|cinder)\/.* gate: diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 6d6cf8fe0..efa9060f8 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -4,9 +4,15 @@ jobs: - kolla-build-ubuntu-binary - kolla-build-ubuntu-source - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-binary - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-ubuntu-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-ubuntu-source-upgrade: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - kolla-ansible-ubuntu-source-zun: files: ^docker\/(zun|kuryr)\/.* - kolla-ansible-ubuntu-source-ceph: diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 479448e72..ef72da3dc 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -64,9 +64,14 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH '"cmd2<0.9.0"', 'influxdb', 'mysqlclient', + '"openstacksdk<0.28.0"', 'os-client-config==1.29.0', 'pbr==4.0.0', 'pymongo', + '"python-cinderclient<5.0.0"', + '"python-glanceclient<2.17.0"', + '"python-keystoneclient<3.20.0"', + '"python-novaclient<14.0.0"', 'python-openstackclient==3.14.0', 'pytz', 'pyudev', diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 2f9429b0d..8997bc4ed 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -23,6 +23,9 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow- RUN sed -i -e "/^mirrorlist/d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/CentOS-Base.repo {% raw %} @@ -44,7 +47,9 @@ RUN sed -i -e "/^mirrorlist/d" \ -e "/^metalink/d" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ @@ -59,8 +64,10 @@ RUN sed -i -e "/^mirrorlist/d" \ RUN sed -i -e "/^mirrorlist/d" \ -e "/^metalink/d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ |