From 606ef4df866487151c876bf776cad6288ece7760 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 6 Jun 2019 20:33:13 +0200 Subject: [PATCH] Revert "Revert "Freeze images with a date"" This reverts commits 6965e1d4e237e0707293704395958c44617a928e, 5cc8cd84150efef2eccd2a84f6276d093956fab6. It also freezes the newly added images for osh-selenium, prometheus-openstack-exporter, nagios, and ovs. LOCI images will be done in a different patch. This leverages an approach which needs Ansible2.8, already tested and (demonstrated working) for libvirt [1]. [1]: https://review.opendev.org/#/c/667339/ Change-Id: I84093f36b24b42d0261a0a8fe393fe06fe57fdb2 --- zuul.d/calicoctl-utility.yaml | 2 ++ zuul.d/ceph-cephfs-provisioner.yaml | 2 ++ zuul.d/ceph-config-helper.yaml | 3 +++ zuul.d/ceph-daemon.yaml | 2 ++ zuul.d/ceph-rbd-provisioner.yaml | 2 ++ zuul.d/ceph-utility.yaml | 2 ++ zuul.d/elasticsearch-s3.yaml | 2 ++ zuul.d/fluentd.yaml | 2 ++ zuul.d/gate-utils.yaml | 3 +++ zuul.d/mariadb.yaml | 2 ++ zuul.d/mini-mirror.yaml | 2 ++ zuul.d/nagios.yaml | 2 ++ zuul.d/openvswitch.yaml | 5 +++++ zuul.d/osh-selenium.yaml | 3 +++ zuul.d/patroni.yaml | 2 ++ zuul.d/prometheus-openstack-exporter.yaml | 2 ++ zuul.d/tempest.yaml | 3 +++ zuul.d/vbmc.yaml | 3 +++ 18 files changed, 44 insertions(+) diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml index 008e9347..edef62b4 100644 --- a/zuul.d/calicoctl-utility.yaml +++ b/zuul.d/calicoctl-utility.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build calicoctl-utility images vars: &calicoctl-utility_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: calicoctl-utility repository: openstackhelm/calicoctl-utility dockerfile: Dockerfile.alpine tags: - latest-alpine + - "alpine-{{ currentdate }}" files: &calicoctl-utility_files - calicoctl-utility/.* - zuul.d/calicoctl-utility.yaml diff --git a/zuul.d/ceph-cephfs-provisioner.yaml b/zuul.d/ceph-cephfs-provisioner.yaml index 93d00deb..14d36f00 100644 --- a/zuul.d/ceph-cephfs-provisioner.yaml +++ b/zuul.d/ceph-cephfs-provisioner.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build ceph-cephfs-provisioner images vars: &ceph-cephfs-provisioner_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: ceph-cephfs-provisioner repository: openstackhelm/ceph-cephfs-provisioner dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &ceph-cephfs-provisioner_files - ceph-cephfs-provisioner/.* - zuul.d/ceph-cephfs-provisioner.yaml diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml index 8a676661..07f0d14e 100644 --- a/zuul.d/ceph-config-helper.yaml +++ b/zuul.d/ceph-config-helper.yaml @@ -32,17 +32,20 @@ parent: openstack-helm-images-build description: Build ceph-config-helper images 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 dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &ceph-config-helper_files - ceph-config-helper/.* - zuul.d/ceph-config-helper.yaml diff --git a/zuul.d/ceph-daemon.yaml b/zuul.d/ceph-daemon.yaml index d107e194..a150ce7f 100644 --- a/zuul.d/ceph-daemon.yaml +++ b/zuul.d/ceph-daemon.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build ceph-daemon images vars: &ceph-daemon_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: ceph-daemon repository: openstackhelm/ceph-daemon dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &ceph-daemon_files - ceph-daemon/.* - zuul.d/ceph-daemon.yaml diff --git a/zuul.d/ceph-rbd-provisioner.yaml b/zuul.d/ceph-rbd-provisioner.yaml index 30b25b80..5b272296 100644 --- a/zuul.d/ceph-rbd-provisioner.yaml +++ b/zuul.d/ceph-rbd-provisioner.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build ceph-rbd-provisioner images vars: &ceph-rbd-provisioner_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: ceph-rbd-provisioner repository: openstackhelm/ceph-rbd-provisioner dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &ceph-rbd-provisioner_files - ceph-rbd-provisioner/.* - zuul.d/ceph-rbd-provisioner.yaml diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml index b5759584..8671872f 100644 --- a/zuul.d/ceph-utility.yaml +++ b/zuul.d/ceph-utility.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build ceph-utility images vars: &ceph-utility_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: ceph-utility repository: openstackhelm/ceph-utility dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &ceph-utility_files - ceph-utility/.* - zuul.d/ceph-utility.yaml diff --git a/zuul.d/elasticsearch-s3.yaml b/zuul.d/elasticsearch-s3.yaml index 97a654bd..7bbf97e4 100644 --- a/zuul.d/elasticsearch-s3.yaml +++ b/zuul.d/elasticsearch-s3.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build s3 compatible elasticsearch image vars: &elasticsearch-s3_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: elasticsearch-s3 repository: openstackhelm/elasticsearch-s3 dockerfile: Dockerfile.5_6_4 tags: - latest-5_6_4 + - "5_6_4-{{ currentdate }}" files: &elasticsearch-s3_files - elasticsearch-s3/.* - zuul.d/elasticsearch-s3.yaml diff --git a/zuul.d/fluentd.yaml b/zuul.d/fluentd.yaml index 9c4ef0f9..0c323fcf 100644 --- a/zuul.d/fluentd.yaml +++ b/zuul.d/fluentd.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build fluentd image with custom plugins vars: &fluentd_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: fluentd repository: openstackhelm/fluentd dockerfile: Dockerfile.debian tags: - latest-debian + - "debian-{{ currentdate }}" files: &fluentd_files - fluentd/.* - zuul.d/fluentd.yaml diff --git a/zuul.d/gate-utils.yaml b/zuul.d/gate-utils.yaml index cf510060..ef420e39 100644 --- a/zuul.d/gate-utils.yaml +++ b/zuul.d/gate-utils.yaml @@ -32,17 +32,20 @@ parent: openstack-helm-images-build description: Build gate-utils images 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 dockerfile: Dockerfile.debian tags: - latest-debian + - "debian-{{ currentdate }}" files: &gate-utils_files - gate-utils/.* - zuul.d/gate-utils.yaml diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml index 42a13590..faa34a02 100644 --- a/zuul.d/mariadb.yaml +++ b/zuul.d/mariadb.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build mariadb images vars: &mariadb_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: mariadb repository: openstackhelm/mariadb dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &mariadb_files - mariadb/.* - zuul.d/mariadb.yaml diff --git a/zuul.d/mini-mirror.yaml b/zuul.d/mini-mirror.yaml index e4ffc209..dfaaf813 100644 --- a/zuul.d/mini-mirror.yaml +++ b/zuul.d/mini-mirror.yaml @@ -33,12 +33,14 @@ parent: openstack-helm-images-build description: Build mini-mirror images vars: &mini-mirror_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: mini-mirror repository: openstackhelm/mini-mirror dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &mini-mirror_files - mini-mirror/.* - zuul.d/mini-mirror.yaml diff --git a/zuul.d/nagios.yaml b/zuul.d/nagios.yaml index 69f242d9..9520f9a2 100644 --- a/zuul.d/nagios.yaml +++ b/zuul.d/nagios.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build Prometheus aware Nagios core 4 image vars: &nagios_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: nagios repository: openstackhelm/nagios dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &nagios_files - nagios/.* - zuul.d/nagios.yaml diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml index 7c30ed3a..e8bb127a 100644 --- a/zuul.d/openvswitch.yaml +++ b/zuul.d/openvswitch.yaml @@ -32,27 +32,32 @@ parent: openstack-helm-images-build description: Build openvswitch images 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 dockerfile: Dockerfile.debian tags: - latest-debian + - "debian-{{ currentdate }}" - context: openvswitch repository: openstackhelm/openvswitch dockerfile: Dockerfile.ubuntu_bionic tags: - latest-ubuntu_bionic + - "ubuntu_bionic-{{ currentdate }}" - context: openvswitch repository: openstackhelm/openvswitch dockerfile: Dockerfile.ubuntu_bionic-dpdk tags: - latest-ubuntu_bionic-dpdk + - "ubuntu_bionic-dpdk-{{ currentdate }}" files: &openvswitch_files - openvswitch/.* - zuul.d/openvswitch.yaml diff --git a/zuul.d/osh-selenium.yaml b/zuul.d/osh-selenium.yaml index 541a427e..7e26f389 100644 --- a/zuul.d/osh-selenium.yaml +++ b/zuul.d/osh-selenium.yaml @@ -32,17 +32,20 @@ parent: openstack-helm-images-build description: Build selenium image with chrome headless driver vars: &osh-selenium_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: osh-selenium repository: openstackhelm/osh-selenium dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ 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/patroni.yaml b/zuul.d/patroni.yaml index e0c7c788..721b2a0a 100644 --- a/zuul.d/patroni.yaml +++ b/zuul.d/patroni.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build patroni images vars: &patroni_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: patroni repository: openstackhelm/patroni dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &patroni_files - patroni/.* - zuul.d/patroni.yaml diff --git a/zuul.d/prometheus-openstack-exporter.yaml b/zuul.d/prometheus-openstack-exporter.yaml index 8f533f43..703365ed 100644 --- a/zuul.d/prometheus-openstack-exporter.yaml +++ b/zuul.d/prometheus-openstack-exporter.yaml @@ -32,12 +32,14 @@ parent: openstack-helm-images-build description: Build Prometheus OpenStack exporter image vars: &prometheus-openstack-exporter_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: prometheus-openstack-exporter repository: openstackhelm/prometheus-openstack-exporter dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ currentdate }}" files: &prometheus-openstack-exporter_files - prometheus-openstack-exporter/.* - zuul.d/prometheus-openstack-exporter.yaml diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml index 2ce60bf9..c2ca3328 100644 --- a/zuul.d/tempest.yaml +++ b/zuul.d/tempest.yaml @@ -32,17 +32,20 @@ parent: openstack-helm-images-build description: Build tempest images vars: &tempest_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: tempest repository: openstackhelm/tempest dockerfile: Dockerfile.ubuntu_xenial tags: - latest-ubuntu_xenial + - "ubuntu_xenial-{{ 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 diff --git a/zuul.d/vbmc.yaml b/zuul.d/vbmc.yaml index 04d8d822..da6a9b71 100644 --- a/zuul.d/vbmc.yaml +++ b/zuul.d/vbmc.yaml @@ -32,17 +32,20 @@ parent: openstack-helm-images-build description: Build vbmc images vars: &vbmc_vars + currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" docker_images: - context: vbmc repository: openstackhelm/vbmc tags: - latest-opensuse_15 + - "opensuse_15-{{ currentdate }}" dockerfile: Dockerfile.suse_15 - context: vbmc repository: openstackhelm/vbmc dockerfile: Dockerfile.centos_7 tags: - latest-centos_7 + - "centos_7-{{ currentdate }}" files: &vbmc_files - vbmc/.* - zuul.d/vbmc.yaml