Cleanup xenial based images when latter alternative is available

Also remove redundant PYTHON3 build argument since it's a default one.

Depends-On: https://review.opendev.org/813709
Change-Id: Id31f5feb5ba7837ef698b9c9bd826a8fb4b7a572
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>

ceph-cephfs-provisioner/Dockerfile.ubuntu_xenial

@@ -1,29 +0,0 @@
-ARG FROM=docker.io/ubuntu:xenial
-FROM ${FROM}
-
-ARG CEPH_RELEASE=mimic
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
-
-ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get install --no-install-recommends -y \
-        apt-transport-https \
-        ca-certificates ;\
-    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        ceph \
-        ceph-common ;\
-    rm -rf /var/lib/apt/lists/* ;\
-    rm -rf /usr/share/doc/ ;\
-    rm -rf /usr/share/man/ ;\
-    rm -rf /usr/share/locale/
-
-COPY --from=quay.io/external_storage/cephfs-provisioner:v1.1.0-k8s1.10 /usr/local/bin/cephfs* /usr/local/bin/
-RUN chmod -v o+x /usr/local/bin/cephfs_provisioner

ceph-config-helper/Dockerfile.ubuntu_xenial

@@ -1,47 +0,0 @@
-ARG FROM=docker.io/ubuntu:xenial
-FROM ${FROM}
-
-ARG DISTRO_CODENAME='xenial'
-
-ARG KUBE_VERSION=v1.16.2
-ARG CEPH_RELEASE=mimic
-
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/${DISTRO_CODENAME}/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/${DISTRO_CODENAME}/archive-ceph-mimic.key
-
-ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y apt-transport-https ca-certificates ;\
-    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    echo deb ${CEPH_REPO} ${DISTRO_CODENAME} main | tee /etc/apt/sources.list.d/ceph.list ;\
-    TMP_DIR=$(mktemp --directory) ;\
-    cd ${TMP_DIR} ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        ceph \
-        curl \
-        gcc \
-        python3 \
-        python3-dev \
-        jq ;\
-    curl -sSL https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3 ;\
-    pip3 --no-cache-dir install --upgrade \
-      crush \
-      rgwadmin \
-      six \
-      s3cmd \
-      python-openstackclient \
-      python-swiftclient ;\
-    curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
-    mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\
-    chmod +x /usr/bin/kubectl ;\
-    rm -rf ${TMP_DIR} ;\
-    apt-get purge -y --auto-remove \
-        python3-dev \
-        gcc ;\
-    rm -rf /var/lib/apt/lists/*

ceph-daemon/Dockerfile.ubuntu_xenial

@@ -1,81 +0,0 @@
-ARG FROM=docker.io/ubuntu:xenial
-FROM ${FROM}
-MAINTAINER matthew.heler@hotmail.com
-
-ARG KUBE_VERSION=1.16.2
-ARG CEPH_RELEASE=mimic
-ARG ETCDCTL_VERSION=3.2.18
-ARG CONFD_VERSION=0.16.0
-
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
-
-ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install -y apt-transport-https ca-certificates ;\
-    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
-    TMP_DIR=$(mktemp --directory) ;\
-    cd ${TMP_DIR} ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        ceph \
-        ceph-common \
-        radosgw \
-        ceph-mds \
-        ceph-fuse \
-        rbd-nbd \
-        rbd-mirror \
-        rbd-fuse \
-        s3cmd \
-        strace \
-        valgrind \
-        hexedit \
-        sysstat \
-        dstat \
-        smartmontools \
-        sdparm \
-        tcpdump \
-        iperf \
-        xfsprogs \
-        rsync \
-        curl \
-        gcc \
-        gdb \
-        python3 \
-        python3-dev \
-        uuid-runtime \
-        jq \
-        alien ;\
-    curl -sSL https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3 ;\
-    pip3 --no-cache-dir install --upgrade \
-      six \
-      python-openstackclient \
-      python-swiftclient ;\
-    curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
-    mv ${TMP_DIR}/client/bin/kubectl /usr/local/bin/kubectl ;\
-    chmod +x /usr/local/bin/kubectl ;\
-    curl -sSL https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.tgz | tar xfz - -C /usr/local/bin/ ;\
-    chmod +x /usr/local/bin/forego ;\
-    curl -sSL https://github.com/coreos/etcd/releases/download/v${ETCDCTL_VERSION}/etcd-v${ETCDCTL_VERSION}-linux-amd64.tar.gz | tar xfz - ;\
-    mv ${TMP_DIR}/etcd-v${ETCDCTL_VERSION}-linux-amd64/etcdctl /usr/local/bin/etcdctl ;\
-    chmod +xr /usr/local/bin/etcdctl ;\
-    curl -sSL https://github.com/kelseyhightower/confd/releases/download/v${CONFD_VERSION}/confd-${CONFD_VERSION}-linux-amd64 -o /usr/local/bin/confd ;\
-    chmod +xr /usr/local/bin/confd ;\
-    curl -sSL https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz | tar xfz - ;\
-    alien -i ${TMP_DIR}/perccli_7.5-007.0529_linux/Linux/perccli-007.0529.0000.0000-1.noarch.rpm ;\
-    mkdir -p /etc/confd/conf.d ;\
-    mkdir -p /etc/confd/templates ;\
-    rm -rf ${TMP_DIR} ;\
-    apt-get purge -y --auto-remove \
-        python3-dev \
-        gcc ;\
-    rm -rf /var/lib/apt/lists/* ;\
-    rm -rf /usr/share/doc/ ;\
-    rm -rf /usr/share/man/ ;\
-    rm -rf /usr/share/locale/

ceph-rbd-provisioner/Dockerfile.ubuntu_xenial

@@ -1,28 +0,0 @@
-ARG FROM=docker.io/ubuntu:xenial
-FROM ${FROM}
-
-ARG CEPH_RELEASE=mimic
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
-
-ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get install --no-install-recommends -y \
-        apt-transport-https \
-        ca-certificates ;\
-    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
-    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        ceph-common ;\
-    rm -rf /var/lib/apt/lists/* ;\
-    rm -rf /usr/share/doc/ ;\
-    rm -rf /usr/share/man/ ;\
-    rm -rf /usr/share/locale/
-
-COPY --from=quay.io/external_storage/rbd-provisioner:v1.1.0-k8s1.10 /usr/local/bin/rbd-provisioner /usr/local/bin/rbd-provisioner
-ENTRYPOINT ["/usr/local/bin/rbd-provisioner"]

ceph-utility/Dockerfile.ubuntu_xenial

@@ -1,26 +0,0 @@
-ARG FROM=docker.io/ubuntu:xenial
-FROM ${FROM}
-
-ARG CEPH_RELEASE=mimic
-ARG KUBE_VERSION=1.16.2
-
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
-
-RUN set -xe \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && sed -i '/nobody/d' /etc/passwd \
-    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update && apt-get dist-upgrade -y \
-    && apt-get install -y wget curl apt-transport-https ca-certificates gnupg\
-    && wget -q -O- ${CEPH_KEY} | apt-key add - \
-    && echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list \
-    && apt-get update && apt-get install -y bash python-oslo.rootwrap moreutils vim sudo screen ceph ceph-common python-rbd radosgw hexedit jq s3cmd rsyslog rsync xz-utils iperf \
-    && apt-get remove --purge -y wget apt-transport-https && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && TMP_DIR=$(mktemp --directory) \
-    && cd ${TMP_DIR} \
-    && curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 \
-    && mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \
-    && chmod +x /usr/bin/kubectl \
-    && rm -rf ${TMP_DIR}
-CMD ["/bin/bash"]

mini-mirror/Dockerfile.ubuntu_xenial

@@ -1,48 +0,0 @@
-# Copyright 2019, AT&T Intellectual Property
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ARG BUILD_FROM=ubuntu:16.04
-ARG FROM=nginx
-FROM ${BUILD_FROM} as aptly
-
-ARG APTLY_CONFIG_PATH=etc/aptly.conf
-ARG MIRROR_SOURCE_FILE=mini-mirror-sources.yaml
-ARG RELEASE_SIGN_KEY_PATH=etc
-ARG RELEASE_SIGN_KEY_PASSPHRASE
-
-RUN apt-get update
-RUN apt-get install -y wget jq python-pip
-RUN pip install yq
-
-COPY "${APTLY_CONFIG_PATH}" /etc/aptly.conf
-COPY tools/install_aptly.sh /opt/install_aptly.sh
-
-ARG APTLY_INSTALL_FROM=source
-ARG APTLY_REPO=https://github.com/smstone/aptly.git
-ARG APTLY_REFSPEC=allow-custom-codename
-
-RUN /opt/install_aptly.sh
-
-COPY "${MIRROR_SOURCE_FILE}" /opt/mini-mirror-sources.yaml
-COPY "${RELEASE_SIGN_KEY_PATH}" /opt/release.gpg
-COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh
-
-RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}"
-
-FROM ${FROM}
-ARG APTLY_SNAPSHOT_DIR=/srv
-
-# NOTE(drewwalters96): This must match the location provided in the NGINX
-#                      config file.
-COPY --from=aptly /opt/.aptly/public "${APTLY_SNAPSHOT_DIR}"

patroni/Dockerfile.ubuntu_xenial

@@ -1,34 +0,0 @@
-ARG FROM=postgres:9.5
-FROM ${FROM}
-MAINTAINER Alexander Kukushkin <alexander.kukushkin@zalando.de>
-
-ARG PATRONI_VERSION
-
-RUN export DEBIAN_FRONTEND=noninteractive \
-    && echo 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommend \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-    && apt-cache depends patroni | sed -n -e 's/.* Depends: \(python3-.\+\)$/\1/p' \
-            | grep -Ev '^python3-(sphinx|etcd|consul|kazoo|kubernetes|urllib3|requests)' \
-            | xargs apt-get install -y vim-tiny curl jq locales git python3-pip python3-wheel \
-    ## Make sure we have a en_US.UTF-8 locale available
-    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
-    && pip3 install setuptools \
-    && pip3 install "git+https://github.com/zalando/patroni.git@${PATRONI_VERSION}#egg=patroni[kubernetes]" \
-    && PGHOME=/home/postgres \
-    && mkdir -p $PGHOME \
-    && chown postgres $PGHOME \
-    && sed -i "s|/var/lib/postgresql.*|$PGHOME:/bin/bash|" /etc/passwd \
-    # Set permissions for OpenShift
-    && chmod 775 $PGHOME \
-    && chmod 664 /etc/passwd \
-    # Clean up
-    && apt-get remove -y git python3-pip python3-wheel \
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/* /root/.cache
-
-EXPOSE 5432 8008
-ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 EDITOR=/usr/bin/editor
-USER postgres
-WORKDIR /home/postgres

patroni/build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT=`realpath $0`
-SCRIPT_DIR=`dirname ${SCRIPT}`
-## Only build from main folder
-cd ${SCRIPT_DIR}/..
-
-IMAGE="patroni"
-VERSION=${VERSION:-latest}
-DISTRO=${DISTRO:-ubuntu_xenial}
-REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
-EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
-
-PATRONI_VERSION=${PATRONI_VERSION:-v1.5.6}
-
-docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host \
-  -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} \
-  --build-arg PATRONI_VERSION=${PATRONI_VERSION} \
-  ${extra_build_args} ${IMAGE}
-
-cd -

zuul.d/base.yaml

@@ -156,8 +156,6 @@
     dependencies:
       - name: openstack-helm-images-build-prometheus-openstack-exporter
         soft: true
-      - name: openstack-helm-images-build-patroni
-        soft: true
       - name: openstack-helm-images-build-osh-selenium
         soft: true
       - name: openstack-helm-images-build-node-problem-detector
@@ -168,8 +166,6 @@
         soft: true
       - name: openstack-helm-images-upload-prometheus-openstack-exporter
         soft: true
-      - name: openstack-helm-images-upload-patroni
-        soft: true
       - name: openstack-helm-images-upload-osh-selenium
         soft: true
       - name: openstack-helm-images-upload-node-problem-detector
@@ -181,8 +177,6 @@
     files:
       - prometheus-openstack-exporter/.*
       - zuul.d/prometheus-openstack-exporter.yaml
-      - patroni/.*
-      - zuul.d/patroni.yaml
       - osh-selenium/.*
       - zuul.d/osh-selenium.yaml
       - node-problem-detector/.*

zuul.d/ceph-cephfs-provisioner.yaml

@@ -34,12 +34,6 @@
     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 }}"
         - context: ceph-cephfs-provisioner
           repository: openstackhelm/ceph-cephfs-provisioner
           dockerfile: Dockerfile.ubuntu_bionic

zuul.d/ceph-config-helper.yaml

@@ -40,12 +40,6 @@
         #    - 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 }}"
         - context: ceph-config-helper
           repository: openstackhelm/ceph-config-helper
           dockerfile: Dockerfile.ubuntu_bionic

zuul.d/ceph-daemon.yaml

@@ -34,12 +34,6 @@
     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 }}"
         - context: ceph-daemon
           repository: openstackhelm/ceph-daemon
           dockerfile: Dockerfile.ubuntu_bionic

zuul.d/ceph-rbd-provisioner.yaml

@@ -34,12 +34,6 @@
     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 }}"
         - context: ceph-rbd-provisioner
           repository: openstackhelm/ceph-rbd-provisioner
           dockerfile: Dockerfile.ubuntu_bionic

zuul.d/ceph-utility.yaml

@@ -34,12 +34,6 @@
     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 }}"
         - context: ceph-utility
           repository: openstackhelm/ceph-utility
           dockerfile: Dockerfile.ubuntu_bionic

zuul.d/mini-mirror.yaml

@@ -17,38 +17,17 @@
 - project:
     check:
       jobs:
-        - openstack-helm-images-build-mini-mirror-xenial
         - openstack-helm-images-build-mini-mirror-bionic
     gate:
       jobs:
-        - openstack-helm-images-upload-mini-mirror-xenial
         - openstack-helm-images-upload-mini-mirror-bionic
     promote:
       jobs:
-        - openstack-helm-images-promote-mini-mirror-xenial
         - openstack-helm-images-promote-mini-mirror-bionic
     periodic:
       jobs:
-        - openstack-helm-images-build-mini-mirror-xenial
         - openstack-helm-images-build-mini-mirror-bionic
 
-- job:
-    name: openstack-helm-images-build-mini-mirror-xenial
-    parent: openstack-helm-images-build
-    description: Build mini-mirror images
-    vars: &mini-mirror-xenial_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
-
 - job:
     name: openstack-helm-images-build-mini-mirror-bionic
     parent: openstack-helm-images-build
@@ -62,14 +41,9 @@
           tags:
             - latest-ubuntu_bionic
             - "ubuntu_bionic-{{ currentdate }}"
-    files: *mini-mirror_files
-
-- job:
-    name: openstack-helm-images-upload-mini-mirror-xenial
-    parent: openstack-helm-images-upload
-    description: Build and upload mini-mirror images
-    vars: *mini-mirror-xenial_vars
-    files: *mini-mirror_files
+    files: &mini-mirror_files
+      - mini-mirror/.*
+      - zuul.d/mini-mirror.yaml
 
 - job:
     name: openstack-helm-images-upload-mini-mirror-bionic
@@ -78,13 +52,6 @@
     vars: *mini-mirror-bionic_vars
     files: *mini-mirror_files
 
-- job:
-    name: openstack-helm-images-promote-mini-mirror-xenial
-    parent: openstack-helm-images-promote
-    description: Promote a previously published mini-mirror image to latest.
-    vars: *mini-mirror-xenial_vars
-    files: *mini-mirror_files
-
 - job:
     name: openstack-helm-images-promote-mini-mirror-bionic
     parent: openstack-helm-images-promote

zuul.d/openstack-loci.yaml

@@ -102,7 +102,7 @@
       base_repository: "base"
       ceph_repo: ""
       ceph_key: ""
-      requirements_pip_packages: "git+https://opendev.org/openstack/heat-dashboard@{{ branchname }}#egg=heat-dashboard"
+      requirements_pip_packages: "git+https://opendev.org/openstack/heat-dashboard@{{ branchname }}#egg=heat-dashboard python-ceilometerclient==2.9.0"
       base_docker_image:
         - &base_image
           context: "zuul.d/playbooks/"
@@ -118,7 +118,6 @@
           repository: openstackhelm/requirements
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='requirements'"
             - "PROJECT_REF={{ branchname }}"
             - "PIP_PACKAGES='{{ requirements_pip_packages }}'"
@@ -134,7 +133,6 @@
           repository: openstackhelm/keystone
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='keystone'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent apache ldap {{ shortbranchname }}'"
@@ -147,11 +145,12 @@
           repository: openstackhelm/heat
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='heat'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent apache'"
             - "WHEELS='{{ wheels_location }}'"
+            # FIXME(aostapenko) python-ceilometerclient was removed from global reqs but is still in heat reqs
+            - "PIP_PACKAGES='python-ceilometerclient==2.9.0'"
             - "DIST_PACKAGES='curl'"
             - "KEEP_ALL_WHEELS=yes"
           tags: *imagetag
@@ -160,7 +159,6 @@
           repository: openstackhelm/barbican
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='barbican'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent'"
@@ -172,7 +170,6 @@
           repository: openstackhelm/glance
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='glance'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent ceph'"
@@ -185,7 +182,6 @@
           repository: openstackhelm/cinder
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='cinder'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent lvm ceph qemu apache'"
@@ -198,7 +194,6 @@
           repository: openstackhelm/neutron
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='neutron'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent linuxbridge openvswitch apache'"
@@ -212,7 +207,6 @@
           repository: openstackhelm/neutron
           build_args:
             - "FROM=docker.io/ubuntu:18.04"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='neutron'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent neutron linuxbridge openvswitch'"
@@ -228,7 +222,6 @@
           repository: openstackhelm/nova
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='nova'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent ceph linuxbridge openvswitch configdrive qemu apache migration'"
@@ -240,7 +233,6 @@
           repository: openstackhelm/horizon
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='horizon'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent apache'"
@@ -253,7 +245,6 @@
           repository: openstackhelm/senlin
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='senlin'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent'"
@@ -265,7 +256,6 @@
           repository: openstackhelm/magnum
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='magnum'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent'"
@@ -277,7 +267,6 @@
           repository: openstackhelm/ironic
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='ironic'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='fluent ipxe ipmi qemu tftp'"
@@ -290,7 +279,6 @@
           repository: openstackhelm/placement
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='placement'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='apache'"
@@ -303,10 +291,11 @@
           repository: openstackhelm/watcher
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='watcher'"
             - "PROJECT_REF={{ branchname }}"
             - "WHEELS='{{ wheels_location }}'"
+            # FIXME(aostapenko) python-ceilometerclient was removed from global reqs but is still used in watcher
+            - "PIP_PACKAGES='python-ceilometerclient==2.9.0'"
             - "KEEP_ALL_WHEELS=yes"
           tags: *imagetag
         - &monasca_api_project
@@ -314,7 +303,6 @@
           repository: openstackhelm/monasca-api
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='monasca-api'"
             - "PROJECT_REF={{ branchname }}"
             - "PROFILES='monasca api'"
@@ -327,7 +315,6 @@
           repository: openstackhelm/cyborg
           build_args:
             - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
             - "PROJECT='cyborg'"
             - "PROJECT_REF={{ branchname }}"
             - "WHEELS='{{ wheels_location }}'"

zuul.d/patroni.yaml

@@ -1,62 +0,0 @@
----
-# Copyright 2019, AT&T Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- project:
-    check:
-      jobs:
-        - openstack-helm-images-build-patroni
-    gate:
-      jobs:
-        - openstack-helm-images-upload-patroni
-    promote:
-      jobs:
-        - openstack-helm-images-promote-patroni
-    periodic:
-      jobs:
-        - openstack-helm-images-upload-patroni
-        - openstack-helm-images-promote-patroni:
-            dependencies:
-              - name: openstack-helm-images-aio-monitoring
-
-- job:
-    name: openstack-helm-images-build-patroni
-    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
-
-- job:
-    name: openstack-helm-images-upload-patroni
-    parent: openstack-helm-images-upload
-    description: Build and upload patroni images
-    vars: *patroni_vars
-    files: *patroni_files
-
-- job:
-    name: openstack-helm-images-promote-patroni
-    parent: openstack-helm-images-promote
-    description: Promote a previously published patroni image to latest.
-    vars: *patroni_vars
-    files: *patroni_files