Pin neutron-tempest-plugin for ussuri/victoria jobs
As stable/victoria is in EM phase, and qa team also pinning
tempest 26.1.0 for stable/victoria
- https://review.opendev.org/c/openstack/devstack/+/843295
To have compatible neutron-tempest-plugin version with Tempest
26.1.0, we need to pin neutron-tempest-plugin 1.6.0 version. And
remove the vicrotia job from master gate.
Also same version we need to pin for stable/ussuri also as stable/ussuri
is also pinned with 26.1.0. in the ussuri
- https://review.opendev.org/c/openstack/devstack/+/838051
with 1.8.0, we are facing some incomaptbile code with Tempest 26.1.0
- https://zuul.opendev.org/t/openstack/build/c4d49a80620b44c7ba708e5afebd2b1c
Also, both EM branch facing below error (bug#1948804)
sudo: guestmount: command not found
and applying the same fix from stable/train
- https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/815518
Depends-On: https://review.opendev.org/c/openstack/devstack/+/838051
Depends-On: https://review.opendev.org/c/openstack/devstack/+/843295
Related-Bug: #1948804
Change-Id: I7d8c1b4cf5c483f1eb4411649c56d6cd8cd3bc66
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 604e5d2..307355a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -198,7 +198,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-victoria
- neutron-tempest-plugin-jobs-wallaby
- neutron-tempest-plugin-jobs-xena
- neutron-tempest-plugin-jobs-yoga
@@ -208,23 +207,19 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-victoria
- neutron-tempest-plugin-sfc-wallaby
- neutron-tempest-plugin-sfc-xena
- neutron-tempest-plugin-sfc-yoga
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-victoria
- neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
- neutron-tempest-plugin-bgpvpn-bagpipe-xena
- neutron-tempest-plugin-bgpvpn-bagpipe-yoga
- neutron-tempest-plugin-dynamic-routing
- - neutron-tempest-plugin-dynamic-routing-victoria
- neutron-tempest-plugin-dynamic-routing-wallaby
- neutron-tempest-plugin-dynamic-routing-xena
- neutron-tempest-plugin-dynamic-routing-yoga
- neutron-tempest-plugin-fwaas
- neutron-tempest-plugin-vpnaas
- - neutron-tempest-plugin-vpnaas-victoria
- neutron-tempest-plugin-vpnaas-wallaby
- neutron-tempest-plugin-vpnaas-xena
- neutron-tempest-plugin-vpnaas-yoga
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index 540ddfa..28fccc6 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -6,7 +6,7 @@
required-projects: &required-projects-ussuri
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- override-checkout: 1.8.0
+ override-checkout: 1.6.0
- openstack/tempest
vars:
devstack_services:
@@ -113,6 +113,12 @@
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
ML2_L3_PLUGIN: router
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
post-config:
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
@@ -276,7 +282,7 @@
required-projects:
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- override-checkout: 1.8.0
+ override-checkout: 1.6.0
- openstack/tempest
- openstack/designate-tempest-plugin
vars:
@@ -313,7 +319,7 @@
- openstack/neutron-fwaas
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- override-checkout: 1.8.0
+ override-checkout: 1.6.0
- openstack/tempest
vars:
branch_override: stable/ussuri
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index 10d58e1..67737a7 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -2,6 +2,11 @@
name: neutron-tempest-plugin-api-victoria
parent: neutron-tempest-plugin-base
override-checkout: stable/victoria
+ required-projects: &required-projects-victoria
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.6.0
+ - openstack/tempest
vars:
devstack_services:
# Disable OVN services
@@ -107,6 +112,12 @@
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
ML2_L3_PLUGIN: router
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
post-config:
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
@@ -126,6 +137,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-victoria
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
tempest_test_regex: "\
@@ -136,6 +148,12 @@
network_available_features: *available_features
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -148,6 +166,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-victoria
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
tempest_test_regex: "\
@@ -158,6 +177,12 @@
network_available_features: *available_features
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -170,6 +195,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-victoria
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
tempest_test_regex: "\
@@ -180,6 +206,12 @@
network_available_features: *available_features
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -192,6 +224,7 @@
name: neutron-tempest-plugin-scenario-ovn-victoria
parent: neutron-tempest-plugin-ovn
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
tempest_test_regex: "\
@@ -201,6 +234,12 @@
network_api_extensions: *api_extensions
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -211,6 +250,7 @@
name: neutron-tempest-plugin-dvr-multinode-scenario-victoria
parent: neutron-tempest-plugin-dvr-multinode-scenario
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
network_api_extensions_common: *api_extensions
branch_override: stable/victoria
@@ -219,14 +259,29 @@
name: neutron-tempest-plugin-designate-scenario-victoria
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/victoria
+ required-projects:
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.6.0
+ - openstack/tempest
+ - name: openstack/designate-tempest-plugin
+ override-checkout: 0.12.0
vars:
branch_override: stable/victoria
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ # NOTE(bcafarel) guestmount binary not available on host OS
+ IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
+ ADVANCED_INSTANCE_TYPE: ds512M
+ ADVANCED_INSTANCE_USER: ubuntu
+ CUSTOMIZE_IMAGE: false
- job:
name: neutron-tempest-plugin-sfc-victoria
parent: neutron-tempest-plugin-sfc
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
network_api_extensions_common: *api_extensions
@@ -235,6 +290,7 @@
name: neutron-tempest-plugin-bgpvpn-bagpipe-victoria
parent: neutron-tempest-plugin-bgpvpn-bagpipe
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
network_api_extensions: *api_extensions
@@ -243,6 +299,7 @@
name: neutron-tempest-plugin-dynamic-routing-victoria
parent: neutron-tempest-plugin-dynamic-routing
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
network_api_extensions_common: *api_extensions
@@ -251,6 +308,7 @@
name: neutron-tempest-plugin-vpnaas-victoria
parent: neutron-tempest-plugin-vpnaas
override-checkout: stable/victoria
+ required-projects: *required-projects-victoria
vars:
branch_override: stable/victoria
network_api_extensions_common: *api_extensions