From 627a04482f73f5bacc07bbad7d0ba3bb45f8e717 Mon Sep 17 00:00:00 2001 From: Andrew Bonney Date: Thu, 3 Dec 2020 15:37:32 +0000 Subject: [PATCH] Ensure kuryr repo is available within CI images This needs to be included explicitly for use by the Zun role until kuryr-libnetwork explicitly depends upon a version of kuryr lib which includes the patch from https://review.opendev.org/c/openstack/kuryr/+/764908 Depends-On: https://review.opendev.org/765839 Depends-On: https://review.opendev.org/766030 Change-Id: Ifd514580702cd99912c3193272b790a04760ae07 --- playbooks/defaults/repo_packages/openstack_services.yml | 8 +++++++- zuul.d/jobs.yaml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index d8c3bc1b22..42ec2ab139 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -344,8 +344,14 @@ zun_git_install_branch: 4014ba9ea326fc15f370c2dda5cecf046275e429 # HEAD as of 29 zun_git_project_group: zun_all zun_git_track_branch: stable/victoria -## Zun kyrir service +## Zun kuryr service zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork zun_kuryr_git_install_branch: 402b764c2f6a1290125d03b5280a5c6b7666b44c # HEAD as of 29.11.2020 zun_kuryr_git_project_group: zun_all zun_kuryr_git_track_branch: stable/victoria + +## Zun kuryr library +zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr +zun_kuryr_lib_git_install_branch: 0af52266184e77e7dff4852200044007a0548415 # HEAD as of 09.12.2020 +zun_kuryr_lib_git_project_group: zun_all +zun_kuryr_lib_git_track_branch: stable/victoria diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 9e857a0e60..226df60a68 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -129,6 +129,7 @@ - name: openstack/blazar-nova - name: openstack/zun - name: openstack/kuryr-libnetwork + - name: openstack/kuryr pre-run: - zuul.d/playbooks/pre-gate-cleanup.yml - zuul.d/playbooks/pre-gate-scenario.yml