diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic b/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic index 3a3f1422..d9ca527b 100644 --- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic +++ b/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic @@ -1,9 +1,9 @@ ARG baseimg=docker.io/ubuntu:bionic FROM ${baseimg} -# Nautilus 14.2.9 +# Nautilus 14.2.10 ARG CEPH_RELEASE=nautilus -ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic +ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/ ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key diff --git a/ceph-config-helper/Dockerfile.ubuntu_bionic b/ceph-config-helper/Dockerfile.ubuntu_bionic index 7d281fb9..788483e2 100644 --- a/ceph-config-helper/Dockerfile.ubuntu_bionic +++ b/ceph-config-helper/Dockerfile.ubuntu_bionic @@ -4,9 +4,9 @@ FROM ${FROM} ARG DISTRO_CODENAME='bionic' ARG KUBE_VERSION=v1.16.2 -# Nautilus 14.2.9 +# Nautilus 14.2.10 ARG CEPH_RELEASE=nautilus -ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic +ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/ ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/archive-ceph-nautilus.key diff --git a/ceph-daemon/Dockerfile.ubuntu_bionic b/ceph-daemon/Dockerfile.ubuntu_bionic index 59ef7644..5c97266a 100644 --- a/ceph-daemon/Dockerfile.ubuntu_bionic +++ b/ceph-daemon/Dockerfile.ubuntu_bionic @@ -2,9 +2,9 @@ ARG FROM=docker.io/ubuntu:bionic FROM ${FROM} ARG KUBE_VERSION=1.16.2 -# Nautilus 14.2.9 +# Nautilus 14.2.10 ARG CEPH_RELEASE=nautilus -ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic +ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic ARG ETCDCTL_VERSION=3.2.18 ARG CONFD_VERSION=0.16.0 diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic b/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic index fe4b9359..c34dc18d 100644 --- a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic +++ b/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic @@ -1,9 +1,9 @@ ARG baseimg=docker.io/ubuntu:bionic FROM ${baseimg} -# Nautilus 14.2.9 +# Nautilus 14.2.10 ARG CEPH_RELEASE=nautilus -ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic +ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/ ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key diff --git a/ceph-utility/Dockerfile.ubuntu_bionic b/ceph-utility/Dockerfile.ubuntu_bionic index 8bbf0a5d..f4e24761 100644 --- a/ceph-utility/Dockerfile.ubuntu_bionic +++ b/ceph-utility/Dockerfile.ubuntu_bionic @@ -1,9 +1,9 @@ ARG FROM=docker.io/ubuntu:bionic FROM ${FROM} -# Nautilus 14.2.9 +# Nautilus 14.2.10 ARG CEPH_RELEASE=nautilus -ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic +ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic ARG KUBE_VERSION=1.16.2 ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/ diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml index fa2a56c9..317c726b 100644 --- a/zuul.d/ceph-config-helper.yaml +++ b/zuul.d/ceph-config-helper.yaml @@ -34,12 +34,12 @@ vars: &ceph-config-helper_vars currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - - context: ceph-config-helper - repository: openstackhelm/ceph-config-helper - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" - dockerfile: Dockerfile.suse_15 + #- context: ceph-config-helper + # repository: openstackhelm/ceph-config-helper + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" + # dockerfile: Dockerfile.suse_15 - context: ceph-config-helper repository: openstackhelm/ceph-config-helper dockerfile: Dockerfile.ubuntu_xenial diff --git a/zuul.d/gate-utils.yaml b/zuul.d/gate-utils.yaml index ef420e39..3138fdf0 100644 --- a/zuul.d/gate-utils.yaml +++ b/zuul.d/gate-utils.yaml @@ -34,12 +34,12 @@ vars: &gate-utils_vars currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - - context: gate-utils - repository: openstackhelm/gate-utils - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" - dockerfile: Dockerfile.suse_15 + #- context: gate-utils + # repository: openstackhelm/gate-utils + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" + # dockerfile: Dockerfile.suse_15 - context: gate-utils repository: openstackhelm/gate-utils dockerfile: Dockerfile.debian diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml index c5f13952..30514970 100644 --- a/zuul.d/libvirt.yaml +++ b/zuul.d/libvirt.yaml @@ -34,12 +34,12 @@ vars: &libvirt_vars currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - - context: libvirt - repository: openstackhelm/libvirt - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" - dockerfile: Dockerfile.suse_15 + #- context: libvirt + # repository: openstackhelm/libvirt + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" + # dockerfile: Dockerfile.suse_15 - context: libvirt repository: openstackhelm/libvirt dockerfile: Dockerfile.ubuntu_xenial @@ -55,7 +55,7 @@ build_args: - "CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/" - "CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key" - - "CEPH_RELEASE_TAG=14.2.9-1.0~bionic" + - "CEPH_RELEASE_TAG=14.2.10-1.0~bionic" files: &libvirt_files - libvirt/.* - zuul.d/libvirt.yaml diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index 01a4687f..feef13ef 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -19,8 +19,6 @@ - openstack-helm-images-build-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-build-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-build-openstack-loci-queens-ubuntu_xenial - - openstack-helm-images-build-openstack-loci-rocky-opensuse_15: - voting: false - openstack-helm-images-build-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-build-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-build-openstack-loci-stein-ubuntu_bionic @@ -32,7 +30,6 @@ - openstack-helm-images-upload-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-queens-ubuntu_xenial - #- openstack-helm-images-upload-openstack-loci-rocky-opensuse_15 - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_bionic @@ -51,7 +48,6 @@ - openstack-helm-images-promote-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-queens-ubuntu_xenial - #- openstack-helm-images-promote-openstack-loci-rocky-opensuse_15 - openstack-helm-images-promote-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-promote-openstack-loci-stein-ubuntu_bionic @@ -63,7 +59,6 @@ - openstack-helm-images-build-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-build-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-build-openstack-loci-queens-ubuntu_xenial - - openstack-helm-images-build-openstack-loci-rocky-opensuse_15 - openstack-helm-images-build-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-build-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-build-openstack-loci-stein-ubuntu_bionic diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml index 47d886d1..804df738 100644 --- a/zuul.d/openvswitch.yaml +++ b/zuul.d/openvswitch.yaml @@ -34,18 +34,18 @@ vars: &openvswitch_vars currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - - context: openvswitch - repository: openstackhelm/openvswitch - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" - dockerfile: Dockerfile.suse_15 - - context: openvswitch - repository: openstackhelm/openvswitch - tags: - - latest-opensuse_15-dpdk - - "opensuse_15-dpdk-{{ currentdate }}" - dockerfile: Dockerfile.suse_15-dpdk + #- context: openvswitch + # repository: openstackhelm/openvswitch + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" + # dockerfile: Dockerfile.suse_15 + #- context: openvswitch + # repository: openstackhelm/openvswitch + # tags: + # - latest-opensuse_15-dpdk + # - "opensuse_15-dpdk-{{ currentdate }}" + # dockerfile: Dockerfile.suse_15-dpdk - context: openvswitch repository: openstackhelm/openvswitch dockerfile: Dockerfile.debian diff --git a/zuul.d/osh-selenium.yaml b/zuul.d/osh-selenium.yaml index c7b19581..45c44362 100644 --- a/zuul.d/osh-selenium.yaml +++ b/zuul.d/osh-selenium.yaml @@ -40,12 +40,12 @@ tags: - latest-ubuntu_bionic - "ubuntu_bionic-{{ currentdate }}" - - context: osh-selenium - repository: openstackhelm/osh-selenium - dockerfile: Dockerfile.opensuse_15 - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" + #- context: osh-selenium + # repository: openstackhelm/osh-selenium + # dockerfile: Dockerfile.opensuse_15 + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" files: &osh-selenium_files - osh-selenium/.* - zuul.d/osh-selenium.yaml diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml index 1bb8c523..ddafd085 100644 --- a/zuul.d/tempest.yaml +++ b/zuul.d/tempest.yaml @@ -46,12 +46,12 @@ tags: - latest-ubuntu_bionic - "ubuntu_bionic-{{ currentdate }}" - - context: tempest - repository: openstackhelm/tempest - dockerfile: Dockerfile.opensuse_15 - tags: - - latest-opensuse_15 - - "opensuse_15-{{ currentdate }}" + #- context: tempest + # repository: openstackhelm/tempest + # dockerfile: Dockerfile.opensuse_15 + # tags: + # - latest-opensuse_15 + # - "opensuse_15-{{ currentdate }}" files: &tempest_files - tempest/.* - zuul.d/tempest.yaml