Added Victoria & Wallaby images

This patch adds the new release images but drops anything that's not
maintained anymore.

Depends-On: https://review.opendev.org/802920
Depends-On: https://review.opendev.org/802984
Depends-On: https://review.opendev.org/803095
Co-Authored-By: Andrii Ostapenko <andrii.ostapenko@att.com>
Change-Id: Id05cee25dc5f6baee0bd1bdf8dcfb5a2707950b8
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Mohammed Naser 2021-04-16 08:30:45 -04:00 committed by Andrii Ostapenko
parent 110fef8a2c
commit e1a72a7cfa
4 changed files with 322 additions and 34 deletions

View File

@ -0,0 +1,25 @@
#!/bin/bash
SCRIPT=`realpath $0`
SCRIPT_DIR=`dirname ${SCRIPT}`
## Only build from main folder
# Replace with Registry URI with your registry like your
# dockerhub user. Example: "docker.io/openstackhelm"
VERSION=${VERSION:-"latest"}
OPENSTACK_VERSION="stable/victoria"
#pycrypto was dropped after queens so we need to override the defaults
keystone_pip_packages=${keystone_pip_packages:-"'python-openstackclient'"}
heat_pip_packages=${heat_pip_packages:-"''"}
barbican_pip_packages=${barbican_pip_packages:-"''"}
glance_pip_packages=${glance_pip_packages:-"'python-swiftclient'"}
cinder_pip_packages=${cinder_pip_packages:-"'python-swiftclient'"}
neutron_pip_packages=${neutron_pip_packages:-"'networking-baremetal'"}
nova_pip_packages=${nova_pip_packages:-"''"}
horizon_pip_packages=${horizon_pip_packages:-"'heat-dashboard'"}
senlin_pip_packages=${senlin_pip_packages:-"''"}
congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"}
magnum_pip_packages=${magnum_pip_packages:-"''"}
ironic_pip_packages=${ironic_pip_packages:-"''"}
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"'networking-baremetal'"}
placement_pip_packages=${placement_pip_packages:-"httplib2"}
source ${SCRIPT_DIR}/build.sh

25
openstack/loci/build-wallaby.sh Executable file
View File

@ -0,0 +1,25 @@
#!/bin/bash
SCRIPT=`realpath $0`
SCRIPT_DIR=`dirname ${SCRIPT}`
## Only build from main folder
# Replace with Registry URI with your registry like your
# dockerhub user. Example: "docker.io/openstackhelm"
VERSION=${VERSION:-"latest"}
OPENSTACK_VERSION="stable/wallaby"
#pycrypto was dropped after queens so we need to override the defaults
keystone_pip_packages=${keystone_pip_packages:-"'python-openstackclient'"}
heat_pip_packages=${heat_pip_packages:-"''"}
barbican_pip_packages=${barbican_pip_packages:-"''"}
glance_pip_packages=${glance_pip_packages:-"'python-swiftclient'"}
cinder_pip_packages=${cinder_pip_packages:-"'python-swiftclient'"}
neutron_pip_packages=${neutron_pip_packages:-"''"}
nova_pip_packages=${nova_pip_packages:-"''"}
horizon_pip_packages=${horizon_pip_packages:-"'heat-dashboard'"}
senlin_pip_packages=${senlin_pip_packages:-"''"}
congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"}
magnum_pip_packages=${magnum_pip_packages:-"''"}
ironic_pip_packages=${ironic_pip_packages:-"''"}
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"'networking-baremetal'"}
placement_pip_packages=${placement_pip_packages:-"httplib2"}
source ${SCRIPT_DIR}/build.sh

View File

@ -22,6 +22,10 @@
- openstack-helm-images-compute-kit-train-ubuntu_bionic
- openstack-helm-images-cinder-train-ubuntu_bionic
- openstack-helm-images-horizon-train-ubuntu_bionic
- openstack-helm-images-compute-kit-victoria-ubuntu_focal
- openstack-helm-images-cinder-victoria-ubuntu_focal
- openstack-helm-images-compute-kit-wallaby-ubuntu_focal
- openstack-helm-images-cinder-wallaby-ubuntu_focal
gate:
jobs:
- opendev-buildset-registry
@ -30,6 +34,10 @@
- openstack-helm-images-compute-kit-train-ubuntu_bionic
- openstack-helm-images-cinder-train-ubuntu_bionic
- openstack-helm-images-horizon-train-ubuntu_bionic
- openstack-helm-images-compute-kit-victoria-ubuntu_focal
- openstack-helm-images-cinder-victoria-ubuntu_focal
- openstack-helm-images-compute-kit-wallaby-ubuntu_focal
- openstack-helm-images-cinder-wallaby-ubuntu_focal
periodic:
jobs:
- opendev-buildset-registry
@ -38,6 +46,10 @@
- openstack-helm-images-compute-kit-train-ubuntu_bionic
- openstack-helm-images-cinder-train-ubuntu_bionic
- openstack-helm-images-horizon-train-ubuntu_bionic
- openstack-helm-images-compute-kit-victoria-ubuntu_focal
- openstack-helm-images-cinder-victoria-ubuntu_focal
- openstack-helm-images-compute-kit-wallaby-ubuntu_focal
- openstack-helm-images-cinder-wallaby-ubuntu_focal
templates:
- publish-openstack-docs-pti
- release-notes-jobs-python3
@ -291,3 +303,127 @@
- zuul.d/openstack-loci.yaml
- minikube-aio/.*
- zuul.d/minikube-aio.yaml
- job:
name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
parent: openstack-helm-compute-kit-victoria-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openvswitch
soft: true
- name: openstack-helm-images-build-openstack-loci-victoria-ubuntu_focal
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-build-libvirt
soft: true
- name: openstack-helm-images-build-minikube-aio
soft: true
- name: openstack-helm-images-upload-openvswitch
soft: true
- name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
- name: openstack-helm-images-upload-libvirt
soft: true
- name: openstack-helm-images-upload-minikube-aio
soft: true
files:
- openvswitch/.*
- zuul.d/openvswitch.yaml
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- mariadb/.*
- zuul.d/mariadb.yaml
- libvirt/.*
- zuul.d/libvirt.yaml
- minikube-aio/.*
- zuul.d/minikube-aio.yaml
- job:
name: openstack-helm-images-cinder-victoria-ubuntu_focal
parent: openstack-helm-cinder-victoria-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openstack-loci-victoria-ubuntu_focal
soft: true
- name: openstack-helm-images-build-minikube-aio
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-minikube-aio
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
files:
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- mariadb/.*
- zuul.d/mariadb.yaml
- minikube-aio/.*
- zuul.d/minikube-aio.yaml
- job:
name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
parent: openstack-helm-compute-kit-wallaby-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openvswitch
soft: true
- name: openstack-helm-images-build-openstack-loci-wallaby-ubuntu_focal
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-build-libvirt
soft: true
- name: openstack-helm-images-build-minikube-aio
soft: true
- name: openstack-helm-images-upload-openvswitch
soft: true
- name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
- name: openstack-helm-images-upload-libvirt
soft: true
- name: openstack-helm-images-upload-minikube-aio
soft: true
files:
- openvswitch/.*
- zuul.d/openvswitch.yaml
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- mariadb/.*
- zuul.d/mariadb.yaml
- libvirt/.*
- zuul.d/libvirt.yaml
- minikube-aio/.*
- zuul.d/minikube-aio.yaml
- job:
name: openstack-helm-images-cinder-wallaby-ubuntu_focal
parent: openstack-helm-cinder-wallaby-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openstack-loci-wallaby-ubuntu_focal
soft: true
- name: openstack-helm-images-build-minikube-aio
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-minikube-aio
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
files:
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- mariadb/.*
- zuul.d/mariadb.yaml
- minikube-aio/.*
- zuul.d/minikube-aio.yaml

View File

@ -18,17 +18,23 @@
jobs:
- openstack-helm-images-build-openstack-loci-train-ubuntu_bionic
- openstack-helm-images-build-openstack-loci-ussuri-ubuntu_bionic
- openstack-helm-images-build-openstack-loci-master-ubuntu_bionic
- openstack-helm-images-build-openstack-loci-victoria-ubuntu_focal
- openstack-helm-images-build-openstack-loci-wallaby-ubuntu_focal
- openstack-helm-images-build-openstack-loci-master-ubuntu_focal
gate:
jobs:
- openstack-helm-images-upload-openstack-loci-train-ubuntu_bionic
- openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
- openstack-helm-images-upload-openstack-loci-master-ubuntu_bionic
- openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
promote:
jobs:
- openstack-helm-images-promote-openstack-loci-train-ubuntu_bionic
- openstack-helm-images-promote-openstack-loci-ussuri-ubuntu_bionic
- openstack-helm-images-promote-openstack-loci-master-ubuntu_bionic
- openstack-helm-images-promote-openstack-loci-victoria-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-wallaby-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-master-ubuntu_focal
periodic:
jobs:
- openstack-helm-images-upload-openstack-loci-train-ubuntu_bionic
@ -41,10 +47,18 @@
- openstack-helm-images-promote-openstack-loci-ussuri-ubuntu_bionic:
dependencies:
- name: openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
- openstack-helm-images-upload-openstack-loci-master-ubuntu_bionic
- openstack-helm-images-promote-openstack-loci-master-ubuntu_bionic:
- openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-victoria-ubuntu_focal:
dependencies:
- name: openstack-helm-images-upload-openstack-loci-master-ubuntu_bionic
- name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-wallaby-ubuntu_focal:
dependencies:
- name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-master-ubuntu_focal:
dependencies:
- name: openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
################
@ -300,7 +314,7 @@
- "PYTHON3={{ python3 }}"
- "PROJECT='monasca-api'"
- "PROJECT_REF={{ branchname }}"
- "PROFILES='apache monasca api'"
- "PROFILES='monasca api'"
- "PIP_PACKAGES='influxdb cassandra-driver sqlalchemy'"
- "WHEELS='{{ wheels_location }}'"
- "KEEP_ALL_WHEELS=yes"
@ -316,17 +330,6 @@
- "WHEELS='{{ wheels_location }}'"
- "KEEP_ALL_WHEELS=yes"
tags: *imagetag
- &designate_project
context: "."
repository: openstackhelm/designate
build_args:
- "FROM='{{ base_repository }}'"
- "PYTHON3={{ python3 }}"
- "PROJECT='designate'"
- "PROJECT_REF={{ branchname }}"
- "WHEELS='{{ wheels_location }}'"
- "KEEP_ALL_WHEELS=yes"
tags: *imagetag
files: &loci-files
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
@ -364,21 +367,21 @@
#############
- job:
name: openstack-helm-images-build-openstack-loci-master-ubuntu_bionic
description: Build LOCI master bionic images
name: openstack-helm-images-build-openstack-loci-master-ubuntu_focal
description: Build LOCI master focal images
parent: openstack-helm-images-build-openstack-loci-master
vars: &build_master_bionic_images
vars: &build_master_focal_images
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
branchname: "master"
shortbranchname: "master"
distroname: "ubuntu_bionic"
from: "docker.io/ubuntu:18.04"
distroname: "ubuntu_focal"
from: "docker.io/ubuntu:20.04"
python3: "yes"
#172.17.0.1 is default docker0 ip.
wheels_location: "http://172.17.0.1:8080/wheels.tar.gz"
base_repository: "base"
ceph_repo: "deb https://mirror.mirantis.com/testing/ceph-nautilus/bionic/ bionic main"
ceph_key: "https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key"
ceph_repo: "deb https://download.ceph.com/debian-octopus/ focal main"
ceph_key: "http://download.ceph.com/keys/release.asc"
base_docker_image:
- <<: *base_image
prep_docker_images:
@ -397,22 +400,123 @@
- <<: *monasca_api_project
- <<: *watcher_project
- <<: *cyborg_project
- <<: *designate_project
- job:
name: openstack-helm-images-upload-openstack-loci-master-ubuntu_bionic
description: Build and upload LOCI master bionic images
name: openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
description: Build and upload LOCI master focal images
parent: openstack-helm-images-upload-openstack-loci-master
vars: *build_master_bionic_images
vars: *build_master_focal_images
files: *loci-files
- job:
name: openstack-helm-images-promote-openstack-loci-master-ubuntu_bionic
name: openstack-helm-images-promote-openstack-loci-master-ubuntu_focal
parent: openstack-helm-images-promote-openstack-loci-master
description: Promote previously published LOCI master bionic images
vars: *build_master_bionic_images
description: Promote previously published LOCI master focal images
vars: *build_master_focal_images
files: *loci-files
###########
# WALLABY #
###########
- job:
name: openstack-helm-images-build-openstack-loci-wallaby-ubuntu_focal
description: Build LOCI wallaby focal images
parent: openstack-helm-images-build-openstack-loci-master
vars: &build_wallaby_focal_images
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
branchname: "stable/wallaby"
shortbranchname: "wallaby"
distroname: "ubuntu_focal"
from: "docker.io/ubuntu:20.04"
python3: "yes"
wheels_location: "http://172.17.0.1:8080/wheels.tar.gz"
base_repository: "base"
ceph_repo: "deb https://download.ceph.com/debian-octopus/ focal main"
ceph_key: "https://download.ceph.com/keys/release.asc"
base_docker_image:
- <<: *base_image
prep_docker_images:
- <<: *prep_requirements_project
docker_images:
- <<: *requirements_project
- <<: *keystone_project
- <<: *glance_project
- <<: *cinder_project
- <<: *nova_project
- <<: *ironic_project
- <<: *neutron_project
- <<: *horizon_project
- <<: *heat_project
- <<: *barbican_project
- <<: *placement_project
- <<: *monasca_api_project
- <<: *watcher_project
- <<: *cyborg_project
- job:
name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
parent: openstack-helm-images-upload-openstack-loci-master
description: Build and upload LOCI wallaby focal images
vars: *build_wallaby_focal_images
- job:
name: openstack-helm-images-promote-openstack-loci-wallaby-ubuntu_focal
parent: openstack-helm-images-promote-openstack-loci-master
description: Promote previously published LOCI wallaby focal images
vars: *build_wallaby_focal_images
############
# VICTORIA #
############
- job:
name: openstack-helm-images-build-openstack-loci-victoria-ubuntu_focal
description: Build LOCI victoria focal images
parent: openstack-helm-images-build-openstack-loci-master
vars: &build_victoria_focal_images
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
branchname: "stable/victoria"
shortbranchname: "victoria"
distroname: "ubuntu_focal"
from: "docker.io/ubuntu:20.04"
python3: "yes"
wheels_location: "http://172.17.0.1:8080/wheels.tar.gz"
base_repository: "base"
ceph_repo: "deb https://download.ceph.com/debian-octopus/ focal main"
ceph_key: "https://download.ceph.com/keys/release.asc"
base_docker_image:
- <<: *base_image
prep_docker_images:
- <<: *prep_requirements_project
docker_images:
- <<: *requirements_project
- <<: *keystone_project
- <<: *glance_project
- <<: *cinder_project
- <<: *nova_project
- <<: *ironic_project
- <<: *neutron_project
- <<: *horizon_project
- <<: *heat_project
- <<: *barbican_project
- <<: *placement_project
- <<: *monasca_api_project
- <<: *watcher_project
- <<: *cyborg_project
- job:
name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
parent: openstack-helm-images-upload-openstack-loci-master
description: Build and upload LOCI victoria focal images
vars: *build_victoria_focal_images
- job:
name: openstack-helm-images-promote-openstack-loci-victoria-ubuntu_focal
parent: openstack-helm-images-promote-openstack-loci-master
description: Promote previously published LOCI victoria focal images
vars: *build_victoria_focal_images
##########
# USSURI #
##########
@ -451,7 +555,6 @@
- <<: *monasca_api_project
- <<: *watcher_project
- <<: *cyborg_project
- <<: *designate_project
- job:
name: openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
@ -502,7 +605,6 @@
- <<: *monasca_api_project
- <<: *watcher_project
- <<: *cyborg_project
- <<: *designate_project
- job:
name: openstack-helm-images-upload-openstack-loci-train-ubuntu_bionic