Skip to content

chore: Update original images #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: neutron-ovn-sync
Choose a base branch
from
Open

chore: Update original images #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60c3f94
fix: Rebuilds neutron to ensure sync compatibility
cloudnull Feb 15, 2025
a6d8083
Update original images with new container
github-actions[bot] Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/release-neutron-oslodb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ on:
type: choice
options:
- master-ubuntu_jammy
- 2023.1-ubuntu_jammy
- 2023.2-ubuntu_jammy
- 2024.1-ubuntu_jammy
pluginTag:
description: 'Set release used for the build environment'
Expand All @@ -22,9 +20,15 @@ on:
type: choice
options:
- "master"
- "2023.1"
- "2023.2"
- "2024.1"
NeutronTag:
description: 'Set Neutron version'
required: true
default: 'sync-add-mode-2024.1'
type: choice
options:
- 'master'
- 'sync-add-mode-2024.1'

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
Expand Down Expand Up @@ -76,6 +80,7 @@ jobs:
build-args: |
VERSION=${{ github.event.inputs.imageTag }}
PLUGIN_VERSION=${{ github.event.inputs.pluginTag }}
NEUTRON_VERSION=${{ github.event.inputs.NeutronTag }}
- name: Dynamically set MY_CONTAINER output option
id: mycontainer
run: echo "MY_CONTAINER=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/neutron-oslodb:${{ github.event.inputs.imageTag }}-${{ env.MY_DATE }}" >> $GITHUB_OUTPUT
Expand Down
1 change: 1 addition & 0 deletions .original-images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
"docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy",
"docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy",
"ghcr.io/cloudnull/genestack/neutron-oslodb:2024.1-ubuntu_jammy-1739635397",
"ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy-1738626813",
"ghcr.io/rackerlabs/genestack/cinder-volume-rxt:2024.1-ubuntu_jammy-1731085441",
"ghcr.io/rackerlabs/genestack/cinder:2024.1-ubuntu_jammy-1738626871",
Expand Down
5 changes: 4 additions & 1 deletion Containerfiles/Neutron-oslo_db-Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
ARG VERSION=master-ubuntu_jammy
FROM openstackhelm/neutron:$VERSION as build
ARG PLUGIN_VERSION=master
ARG NEUTRON_VERSION=master
RUN apt update && apt install -y git
RUN export ORIG_PLUGIN_VERSION="${PLUGIN_VERSION}"; \
if [ "${PLUGIN_VERSION}" != 'master' ]; then export PLUGIN_VERSION=stable/${PLUGIN_VERSION}; fi; \
. /var/lib/openstack/bin/activate; \
/var/lib/openstack/bin/pip install git+https://github.com/openstack/oslo.db@${PLUGIN_VERSION}#egg=oslo_db
/var/lib/openstack/bin/pip install --upgrade \
git+https://github.com/openstack/oslo.db@${PLUGIN_VERSION}#egg=oslo_db \
git+https://github.com/rackerlabs/neutron@${NEUTRON_VERSION}#egg=neutron

FROM openstackhelm/neutron:${VERSION}
COPY --from=build /var/lib/openstack/. /var/lib/openstack/