From b7daf9b1996927bfd087a518d8d00f14f24015cf Mon Sep 17 00:00:00 2001
From: renliang17 <renliang@uniontech.com>
Date: Fri, 4 Nov 2022 13:58:22 +0800
Subject: [PATCH 1/2] Update documentation link for openSUSE index.

Change-Id: Ie8dd684a7b79b0a322b1f2d17fffb4d58cfe94fc
(cherry picked from commit 562e9704f8ed292889f5786d373f9f09cf87ae8a)
---
 doc/source/install/environment-networking-obs.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/install/environment-networking-obs.rst b/doc/source/install/environment-networking-obs.rst
index d5ee761e9b4..b04a483199c 100644
--- a/doc/source/install/environment-networking-obs.rst
+++ b/doc/source/install/environment-networking-obs.rst
@@ -9,7 +9,7 @@ For more information on how to configure networking on your
 distribution, see the `SLES 12
 <https://www.suse.com/documentation/sles-12/book_sle_admin/data/sec_basicnet_manconf.html>`__
 or `openSUSE
-<https://doc.opensuse.org/documentation/leap/reference/html/book.opensuse.reference/cha.network.html>`__
+<https://doc.opensuse.org/documentation/leap/reference/html/book-reference/cha-network.html>`__
 documentation.
 
 All nodes require Internet access for administrative purposes such as package

From 9a8301796bafca1b30bc27881a49b0d74680268d Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Sun, 13 Nov 2022 05:49:30 +0100
Subject: [PATCH 2/2] [stable-only] Add "tempest-integrated-networking" job to
 experimental

Added "tempest-integrated-networking" job to experimental queue. This
patch is inline with [1]. During the October 2022 PTG was approved the
addition of this new job to the check and gate queues.

In order to increase the coverage in the stable releases too, this job
is also added to the experimental queue in the stable releases. It
could be useful for some specific backports.

[1]https://review.opendev.org/c/openstack/neutron/+/861948

Conflicts:
      zuul.d/job-templates.yaml

Change-Id: Iaf29998bc203ec46fd42c7e8decb26b6c3bb7312
(cherry picked from commit 41eaaeb2914b8405f38faa74e000190c747460b8)
---
 zuul.d/job-templates.yaml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index f8d94db5230..0c1baf3e346 100644
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@@ -49,6 +49,42 @@
       jobs:
         - neutron-ovn-grenade-multinode
         - neutron-ovn-tempest-with-uwsgi-loki
+        - tempest-integrated-networking:
+            irrelevant-files:
+              - ^\.pylintrc$
+              - ^test-requirements.txt$
+              - ^releasenotes/.*$
+              - ^doc/.*$
+              - ^setup.cfg$
+              - ^.*\.conf\.sample$
+              - ^.*\.rst$
+              - ^neutron/locale/.*$
+              - ^neutron/tests/.*$
+              - ^tools/.*$
+              - ^tox.ini$
+              - ^neutron/agent/dhcp/.*$
+              - ^neutron/agent/l2/.*$
+              - ^neutron/agent/l3/.*$
+              - ^neutron/agent/metadata/.*$
+              - ^neutron/agent/windows/.*$
+              - ^neutron/agent/dhcp_agent.py
+              - ^neutron/agent/l3_agent.py
+              - ^neutron/agent/metadata_agent.py
+              - ^neutron/agent/resource_cache.py
+              - ^neutron/agent/rpc.py
+              - ^neutron/agent/securitygroup_rpc.py
+              - ^neutron/plugins/ml2/drivers/linuxbridge/.*$
+              - ^neutron/plugins/ml2/drivers/openvswitch/.*$
+              - ^neutron/plugins/ml2/drivers/macvtap/.*$
+              - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
+              - ^neutron/services/qos/drivers/linuxbridge/.*$
+              - ^neutron/services/qos/drivers/openvswitch/.*$
+              - ^neutron/services/trunk/drivers/linuxbridge/.*$
+              - ^neutron/services/trunk/drivers/openvswitch/.*$
+              - ^neutron/scheduler/.*$
+              - ^roles/.*functional.*$
+              - ^playbooks/.*functional.*$
+              - ^zuul.d/(?!(project)).*\.yaml
 
 - project-template:
     name: neutron-periodic-jobs