Align Openstack build jobs with release cycle

- Stop building Yoga images
- Test 2024.1 images after building

Depends-On: I7c6e676087b4ed1f8acc9dd39558dfa79e1b0dff
Change-Id: I13049f06a3a04b2a4e7ee48419973058157fc272
This commit is contained in:
Vladimir Kozhukalov 2024-04-24 17:55:21 -05:00
parent 0b77f581de
commit c14f444195
10 changed files with 10 additions and 267 deletions

View File

@ -1,25 +0,0 @@
#!/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

View File

@ -1,25 +0,0 @@
#!/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

@ -1,25 +0,0 @@
#!/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/xena"
#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

@ -1,25 +0,0 @@
#!/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/yoga"
#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:-"''"}
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

@ -19,8 +19,6 @@
- openstack-helm-images-buildset-registry
- openstack-helm-images-monitoring
- openstack-helm-images-logging
- openstack-helm-images-compute-kit-yoga-ubuntu_focal
- openstack-helm-images-cinder-yoga-ubuntu_focal
- openstack-helm-images-compute-kit-zed-ubuntu_focal
- openstack-helm-images-cinder-zed-ubuntu_focal
- openstack-helm-images-compute-kit-2023-1-ubuntu_focal
@ -33,8 +31,6 @@
- openstack-helm-images-buildset-registry
- openstack-helm-images-monitoring
- openstack-helm-images-logging
- openstack-helm-images-compute-kit-yoga-ubuntu_focal
- openstack-helm-images-cinder-yoga-ubuntu_focal
- openstack-helm-images-compute-kit-zed-ubuntu_focal
- openstack-helm-images-cinder-zed-ubuntu_focal
- openstack-helm-images-compute-kit-2023-1-ubuntu_focal
@ -47,8 +43,6 @@
- openstack-helm-images-buildset-registry
- openstack-helm-images-monitoring
- openstack-helm-images-logging
- openstack-helm-images-compute-kit-yoga-ubuntu_focal
- openstack-helm-images-cinder-yoga-ubuntu_focal
- openstack-helm-images-compute-kit-zed-ubuntu_focal
- openstack-helm-images-cinder-zed-ubuntu_focal
- openstack-helm-images-compute-kit-2023-1-ubuntu_focal
@ -222,56 +216,6 @@
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- job:
name: openstack-helm-images-compute-kit-yoga-ubuntu_focal
parent: openstack-helm-compute-kit-yoga-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openvswitch
soft: true
- name: openstack-helm-images-build-openstack-loci-yoga-ubuntu_focal
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-build-libvirt
soft: true
- name: openstack-helm-images-upload-openvswitch
soft: true
- name: openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
- name: openstack-helm-images-upload-libvirt
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
- job:
name: openstack-helm-images-cinder-yoga-ubuntu_focal
parent: openstack-helm-cinder-yoga-ubuntu_focal
match-on-config-updates: false
dependencies:
- name: openstack-helm-images-build-openstack-loci-yoga-ubuntu_focal
soft: true
- name: openstack-helm-images-build-mariadb
soft: true
- name: openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
soft: true
- name: openstack-helm-images-upload-mariadb
soft: true
files:
- ^openstack/loci/.*
- zuul.d/openstack-loci.yaml
- mariadb/.*
- zuul.d/mariadb.yaml
- job:
name: openstack-helm-images-compute-kit-zed-ubuntu_focal
parent: openstack-helm-compute-kit-zed-ubuntu_focal

View File

@ -29,8 +29,7 @@
- openstack-helm-images-promote-libvirt:
dependencies:
- name: openstack-helm-images-upload-libvirt
# - name: openstack-helm-images-compute-kit-2023-1-ubuntu_focal
# - name: openstack-helm-images-compute-kit-2023-2-ubuntu_jammy
- name: openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- job:
name: openstack-helm-images-build-libvirt
@ -39,33 +38,6 @@
vars: &libvirt_vars
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
docker_images:
- context: libvirt
repository: openstackhelm/libvirt
dockerfile: Dockerfile
arch:
- linux/amd64
tags:
- "yoga-focal-{{ currentdate }}"
- "yoga-focal"
- "yoga-ubuntu_focal-{{ currentdate }}"
- "yoga-ubuntu_focal"
- "yoga"
build_args:
- FROM=ubuntu:focal
- RELEASE=yoga
- context: libvirt
repository: openstackhelm/libvirt
dockerfile: Dockerfile
arch:
- linux/amd64
tags:
- "yoga-jammy-{{ currentdate }}"
- "yoga-jammy"
- "yoga-ubuntu_jammy-{{ currentdate }}"
- "yoga-ubuntu_jammy"
build_args:
- FROM=ubuntu:jammy
- RELEASE=yoga
- context: libvirt
repository: openstackhelm/libvirt
dockerfile: Dockerfile

View File

@ -16,13 +16,13 @@
check:
jobs:
- openstack-helm-images-build-openstack-2024-1-ubuntu_jammy
# - openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
# - openstack-helm-images-cinder-2024-1-ubuntu_jammy
- openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- openstack-helm-images-cinder-2024-1-ubuntu_jammy
gate:
jobs:
- openstack-helm-images-upload-openstack-2024-1-ubuntu_jammy
# - openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
# - openstack-helm-images-cinder-2024-1-ubuntu_jammy
- openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- openstack-helm-images-cinder-2024-1-ubuntu_jammy
promote:
jobs:
- openstack-helm-images-promote-openstack-2024-1-ubuntu_jammy
@ -31,11 +31,10 @@
- openstack-helm-images-upload-openstack-2024-1-ubuntu_jammy
- openstack-helm-images-promote-openstack-2024-1-ubuntu_jammy:
dependencies:
- name: openstack-helm-images-upload-openstack-2024-1-ubuntu_jammy
# - name: openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
# - name: openstack-helm-images-cinder-2024-1-ubuntu_jammy
# - openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
# - openstack-helm-images-cinder-2024-1-ubuntu_jammy
- name: openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- name: openstack-helm-images-cinder-2024-1-ubuntu_jammy
- openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- openstack-helm-images-cinder-2024-1-ubuntu_jammy
- job:
name: openstack-helm-images-build-openstack-2024-1-ubuntu_jammy

View File

@ -16,7 +16,6 @@
- project:
check:
jobs:
- openstack-helm-images-build-openstack-loci-yoga-ubuntu_focal
- openstack-helm-images-build-openstack-loci-zed-ubuntu_focal
- openstack-helm-images-build-openstack-loci-zed-ubuntu_jammy
- openstack-helm-images-build-openstack-loci-2023-1-ubuntu_focal
@ -24,7 +23,6 @@
- openstack-helm-images-build-openstack-loci-master-ubuntu_jammy
gate:
jobs:
- openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-zed-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-zed-ubuntu_jammy
- openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_focal
@ -32,7 +30,6 @@
- openstack-helm-images-upload-openstack-loci-master-ubuntu_jammy
promote:
jobs:
- openstack-helm-images-promote-openstack-loci-yoga-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-zed-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-zed-ubuntu_jammy
- openstack-helm-images-promote-openstack-loci-2023-1-ubuntu_focal
@ -40,11 +37,6 @@
- openstack-helm-images-promote-openstack-loci-master-ubuntu_jammy
periodic-weekly:
jobs:
- openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-yoga-ubuntu_focal:
dependencies:
- name: openstack-helm-images-compute-kit-yoga-ubuntu_focal
- name: openstack-helm-images-cinder-yoga-ubuntu_focal
- openstack-helm-images-upload-openstack-loci-zed-ubuntu_focal
- openstack-helm-images-promote-openstack-loci-zed-ubuntu_focal:
dependencies:
@ -675,58 +667,3 @@
parent: openstack-helm-images-promote-openstack-loci-master
description: Promote previously published LOCI zed jammy images
vars: *build_zed_jammy_images
########
# YOGA #
########
- job:
name: openstack-helm-images-build-openstack-loci-yoga-ubuntu_focal
description: Build LOCI yoga focal images
parent: openstack-helm-images-build-openstack-loci-master
vars: &build_yoga_focal_images
currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
branchname: "stable/yoga"
shortbranchname: "yoga"
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-quincy/ 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
- <<: *masakari_project
- <<: *masakari_monitors_project
- <<: *manila_project
- <<: *tacker_project
- job:
name: openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
parent: openstack-helm-images-upload-openstack-loci-master
description: Build and upload LOCI yoga focal images
vars: *build_yoga_focal_images
- job:
name: openstack-helm-images-promote-openstack-loci-yoga-ubuntu_focal
parent: openstack-helm-images-promote-openstack-loci-master
description: Promote previously published LOCI yoga focal images
vars: *build_yoga_focal_images

View File

@ -71,15 +71,6 @@
build_args:
- FROM=ubuntu:jammy
- OPENSTACK_RELEASE=zed
- context: openstack_client
repository: openstackhelm/openstack-client
dockerfile: Dockerfile.ubuntu
tags:
- "yoga"
- "yoga-{{ currentdate }}"
build_args:
- FROM=ubuntu:jammy
- OPENSTACK_RELEASE=yoga
files: &openstack_client_files
- openstack_client/.*
- zuul.d/openstack_client.yaml

View File

@ -28,8 +28,8 @@
- openstack-helm-images-upload-openvswitch
- openstack-helm-images-promote-openvswitch:
dependencies:
- name: openstack-helm-images-compute-kit-yoga-ubuntu_focal
- name: openstack-helm-images-compute-kit-zed-ubuntu_focal
- name: openstack-helm-images-compute-kit-2024-1-ubuntu_jammy
- job:
name: openstack-helm-images-build-openvswitch