Skip to content

Commit

Permalink
Merge branch 'main' into remove-sources
Browse files Browse the repository at this point in the history
  • Loading branch information
berendt authored Oct 4, 2024
2 parents 7677d7f + c4d6552 commit 3093135
Show file tree
Hide file tree
Showing 65 changed files with 1,017 additions and 498 deletions.
100 changes: 72 additions & 28 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,33 +87,41 @@
RwuErxyB0erVvm076vn7Dx8NT9T58s08hNS0HFLG7aOpwV2nHECCHYDWO0yWXI=

- semaphore:
name: semaphore-container-images-kolla-push-zed
name: semaphore-container-images-kolla-push-antelope
max: 1

- semaphore:
name: semaphore-container-images-kolla-push-antelope
name: semaphore-container-images-kolla-push-bobcat
max: 1

- semaphore:
name: semaphore-container-images-kolla-push-bobcat
name: semaphore-container-images-kolla-push-caracal
max: 1

- semaphore:
name: semaphore-container-images-kolla-push-caracal-aarch64
max: 1

- job:
name: container-images-kolla-build
nodeset: ubuntu-jammy-large
pre-run: playbooks/pre.yml
run: playbooks/build.yml
timeout: 10800
vars:
docker_namespace: kolla
docker_registry: osism.harbor.regio.digital
name: container-images-kolla-build
nodeset: ubuntu-jammy-large
pre-run: playbooks/pre.yml
run: playbooks/build.yml
timeout: 10800
vars:
docker_namespace: kolla
docker_registry: osism.harbor.regio.digital

- job:
name: container-images-kolla-build-zed
parent: container-images-kolla-build
name: container-images-kolla-build-aarch64
nodeset: ubuntu-jammy-large
pre-run: playbooks/pre.yml
run: playbooks/build.yml
timeout: 10800
vars:
version_openstack: zed
push_images: false
base_arch: aarch64
docker_namespace: kolla/aarch64
docker_registry: osism.harbor.regio.digital

- job:
name: container-images-kolla-build-antelope
Expand All @@ -130,17 +138,18 @@
push_images: false

- job:
name: container-images-kolla-push-zed
name: container-images-kolla-build-caracal
parent: container-images-kolla-build
semaphores:
- name: semaphore-container-images-kolla-push-zed
vars:
version_openstack: zed
push_images: true
secrets:
- name: secret
secret: SECRET_CONTAINER_IMAGES_KOLLA
pass-to-parent: true
version_openstack: "2024.1"
push_images: false

- job:
name: container-images-kolla-build-caracal-aarch64
parent: container-images-kolla-build-aarch64
vars:
version_openstack: "2024.1"
push_images: false

- job:
name: container-images-kolla-push-antelope
Expand Down Expand Up @@ -168,6 +177,32 @@
secret: SECRET_CONTAINER_IMAGES_KOLLA
pass-to-parent: true

- job:
name: container-images-kolla-push-caracal
parent: container-images-kolla-build
semaphores:
- name: semaphore-container-images-kolla-push-caracal
vars:
version_openstack: "2024.1"
push_images: true
secrets:
- name: secret
secret: SECRET_CONTAINER_IMAGES_KOLLA
pass-to-parent: true

- job:
name: container-images-kolla-push-caracal-aarch64
parent: container-images-kolla-build-aarch64
semaphores:
- name: semaphore-container-images-kolla-push-caracal-aarch64
vars:
version_openstack: "2024.1"
push_images: true
secrets:
- name: secret
secret: SECRET_CONTAINER_IMAGES_KOLLA
pass-to-parent: true

- job:
name: container-images-kolla-release
parent: container-images-kolla-build
Expand All @@ -184,31 +219,40 @@
check:
jobs:
- flake8
- python-black
- yamllint
label:
jobs:
- container-images-kolla-build-zed
- container-images-kolla-build-antelope
- container-images-kolla-build-bobcat
- container-images-kolla-build-caracal
- container-images-kolla-build-caracal-aarch64
gate:
jobs:
- flake8
- python-black
- yamllint
periodic-daily:
jobs:
- flake8
- python-black
- yamllint
- container-images-kolla-push-zed
periodic-midnight:
jobs:
- container-images-kolla-push-antelope
- container-images-kolla-push-bobcat
- container-images-kolla-push-caracal
- container-images-kolla-push-caracal-aarch64
post:
jobs:
- container-images-kolla-push-zed:
branches: main
- container-images-kolla-push-antelope:
branches: main
- container-images-kolla-push-bobcat:
branches: main
- container-images-kolla-push-caracal:
branches: main
- container-images-kolla-push-caracal-aarch64:
branches: main
tag:
jobs:
- container-images-kolla-release
2 changes: 1 addition & 1 deletion defaults/zed.sh → defaults/2024.1.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export BASE_VERSION=22.04
export BUILD_ID=$(date +%Y%m%d)
export KOLLA_TYPE=
export BASE_VERSION=22.04
3 changes: 0 additions & 3 deletions defaults/xena.sh

This file was deleted.

3 changes: 2 additions & 1 deletion etc/tag-images-with-the-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ elasticsearch: dpkg -s elasticsearch-oss
elasticsearch-curator: pip3 show elasticsearch_curator
# etcd Version: 3.2.26
etcd: etcd --version
fluentd: dpkg -s td-agent
fluentd: dpkg -s fluent-package
glance: pip3 show glance
gnocchi: pip3 show gnocchi
grafana: dpkg -s grafana
Expand Down Expand Up @@ -81,6 +81,7 @@ prometheus-openstack-exporter: echo
prometheus-ovn-exporter: /opt/ovn-exporter --version
# prometheus, version 2.26.1 (branch: HEAD, revision: 6eeded0fdf760e81af75d9c44ce539ab77da4505)
prometheus-v2-server: /opt/prometheus/prometheus --version
proxysql: dpkg -s proxysql
rabbitmq: dpkg -s rabbitmq-server
redis: dpkg -s redis-server
redis-sentinel: dpkg -s redis-sentinel
Expand Down
Binary file removed overlays/2023.1/base/osism.gpg
Binary file not shown.
31 changes: 31 additions & 0 deletions overlays/2023.1/nova/nova-spicehtml5proxy/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% block nova_spicehtml5proxy_header %}{% endblock %}

{% import "macros.j2" as macros with context %}

{% set nova_spicehtml5proxy_packages = [
'websockify'
] %}

RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \
&& rm -rf \
/usr/share/spice-html5/.git \
/usr/share/spice-html5/COPYING \
/usr/share/spice-html5/COPYING.LESSER \
/usr/share/spice-html5/Makefile \
/usr/share/spice-html5/README \
/usr/share/spice-html5/TODO \
/usr/share/spice-html5/apache.conf.sample \
/usr/share/spice-html5/package.json.in \
/usr/share/spice-html5/spice-html5.spec.in

{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}

{% block nova_spicehtml5proxy_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER nova
Binary file removed overlays/2023.2/base/osism.gpg
Binary file not shown.
31 changes: 31 additions & 0 deletions overlays/2023.2/nova/nova-spicehtml5proxy/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% block nova_spicehtml5proxy_header %}{% endblock %}

{% import "macros.j2" as macros with context %}

{% set nova_spicehtml5proxy_packages = [
'websockify'
] %}

RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \
&& rm -rf \
/usr/share/spice-html5/.git \
/usr/share/spice-html5/COPYING \
/usr/share/spice-html5/COPYING.LESSER \
/usr/share/spice-html5/Makefile \
/usr/share/spice-html5/README \
/usr/share/spice-html5/TODO \
/usr/share/spice-html5/apache.conf.sample \
/usr/share/spice-html5/package.json.in \
/usr/share/spice-html5/spice-html5.spec.in

{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}

{% block nova_spicehtml5proxy_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER nova
Binary file added overlays/2024.1/base/erlang.gpg
Binary file not shown.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://archive.ubuntu.com/ubuntu/ jammy-backports main universe

# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/zed main
deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main
31 changes: 31 additions & 0 deletions overlays/2024.1/nova/nova-spicehtml5proxy/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% block nova_spicehtml5proxy_header %}{% endblock %}

{% import "macros.j2" as macros with context %}

{% set nova_spicehtml5proxy_packages = [
'websockify'
] %}

RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \
&& rm -rf \
/usr/share/spice-html5/.git \
/usr/share/spice-html5/COPYING \
/usr/share/spice-html5/COPYING.LESSER \
/usr/share/spice-html5/Makefile \
/usr/share/spice-html5/README \
/usr/share/spice-html5/TODO \
/usr/share/spice-html5/apache.conf.sample \
/usr/share/spice-html5/package.json.in \
/usr/share/spice-html5/spice-html5.spec.in

{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}

{% block nova_spicehtml5proxy_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER nova
Binary file removed overlays/zed/base/erlang.gpg
Binary file not shown.
Binary file removed overlays/zed/base/osism.gpg
Binary file not shown.
Loading

0 comments on commit 3093135

Please sign in to comment.