diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-04-29 19:35:41 +0200 |
|---|---|---|
| committer | Iury Gregory Melo Ferreira <imelofer@redhat.com> | 2022-05-31 15:34:26 -0300 |
| commit | dee6b0c294b357a759c6cc54ccdc17835b2bd84f (patch) | |
| tree | 173a07cee619315bcb866b9c38e399b9f1d93d30 | |
| parent | b9445d4e4ac2061b719176c38788efc0595a4ff5 (diff) | |
| download | ironic-dee6b0c294b357a759c6cc54ccdc17835b2bd84f.tar.gz | |
Fix tox template and ironic-lib from src and branch detection in IPA
Prevents the ironic-lib CI from testing ironic-lib changes in IPA.
Updates the project tempalte to use xena requirements
Change-Id: I936f6c1506c585826501ff3ac0bad0c755b4d360
(cherry picked from commit b94e52f55a0c4f9d6f3a771179da4ec5ccbddbd7)
(cherry picked from commit 41f8ed7c0bf1ba84c6df3c0c080b571e326396aa)
| -rw-r--r-- | devstack/lib/ironic | 8 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 40 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 2 |
3 files changed, 48 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 2e2e46c3b..8e0a3a45c 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -2772,6 +2772,9 @@ function build_tinyipa_ramdisk { export AUTHORIZE_SSH=true export SSH_PUBLIC_KEY=$IRONIC_ANSIBLE_SSH_KEY.pub fi + if [ -e $DEST/ironic-lib ]; then + export IRONIC_LIB_SOURCE="$DEST/ironic-lib" + fi make cp tinyipa.gz $ramdisk_path cp tinyipa.vmlinuz $kernel_path @@ -2822,9 +2825,10 @@ function build_ipa_dib_ramdisk { install_diskimage_builder fi - if -e $DEST/ironic-lib; then + if [ -e $DEST/ironic-lib ]; then export IRONIC_LIB_FROM_SOURCE=true export DIB_REPOLOCATION_ironic_lib=$DEST/ironic-lib + export DIB_REPOREF_ironic_lib=$TARGET_BRANCH fi echo "Building IPA ramdisk with DIB options: $IRONIC_DIB_RAMDISK_OPTIONS" @@ -2836,7 +2840,9 @@ function build_ipa_dib_ramdisk { DIB_DHCP_TIMEOUT=$IRONIC_DIB_DHCP_TIMEOUT \ DIB_RELEASE=$IRONIC_DIB_RAMDISK_RELEASE \ DIB_REPOLOCATION_ironic_python_agent="$IRONIC_PYTHON_AGENT_DIR" \ + DIB_REPOREF_ironic_python_agent=$TARGET_BRANCH \ DIB_REPOLOCATION_requirements="$DEST/requirements" \ + DIB_REPOREF_requirements=$TARGET_BRANCH \ disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \ -x -o "$tempdir/ironic-agent" \ ironic-python-agent-ramdisk diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 62822a713..46bdc9710 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -1027,3 +1027,43 @@ EBTABLES_RACE_FIX: True LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images IRONIC_VM_LOG_DIR: '/opt/stack/ironic-bm-logs' + +- project-template: + name: openstack-python3-xena-jobs-ironic-bugfix181 + description: | + Runs unit tests for an OpenStack Python project under the CPython + version 3 releases designated for testing in the Xena release. + check: + jobs: + - openstack-tox-pep8: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + - openstack-tox-py36: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + - openstack-tox-py38: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + - openstack-tox-py39: + voting: + false + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + gate: + jobs: + - openstack-tox-pep8: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + - openstack-tox-py36: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena + - openstack-tox-py38: + required-projects: + - name: openstack/requirements + override-checkout: stable/xena diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 30a7069f7..71c52d215 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -2,7 +2,7 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-python3-xena-jobs + - openstack-python3-xena-jobs-ironic-bugfix181 - openstack-python3-xena-jobs-arm64 - periodic-stable-jobs - publish-openstack-docs-pti |