Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Dear release team, please unblock package python-oslo.messaging

I've packaged the last upstream point release (ie: bugfix for what
is already in Buster). The only really impacting commit is:

d75eba02 Retry to declare a queue after internal error

which can bee seen separately here:
https://opendev.org/openstack/oslo.messaging/commit/d75eba02c74d309cd769a8257d2d20f735c60ad1

The other commits in this point release are:
7c00cc2c OpenDev Migration Patch
70c56a47 Replace openstack.org git:// URLs with https://
82f9d306 Mark telemetry tests nv and remove from gate
693cd964 Add release note for amqp library TLS/SSL error

none of which are code change, so they are safe to include
(and I prefer to include them because it's easier to manage
for me).

Note that the previous behavior of not retrying to re-declare
a queue in the RabbitMQ message bus is very much impacting, and
I had to suffer it's impact myself. The result is that the admin
has to restart the full of the rabbitmq cluster, which isn't fun
at all when you have lots of compute nodes in the cluster. So,
very much, I'd like this to reach Buster, and so would any OpenStack
on Debian user.

Debdiff attached. Cheers,

Thomas Goirand (zigo)

unblock python-oslo.messaging/8.1.3-1
diff -Nru python-oslo.messaging-8.1.2/debian/changelog 
python-oslo.messaging-8.1.3/debian/changelog
--- python-oslo.messaging-8.1.2/debian/changelog        2019-01-16 
23:01:57.000000000 +0100
+++ python-oslo.messaging-8.1.3/debian/changelog        2019-05-17 
14:33:29.000000000 +0200
@@ -1,3 +1,11 @@
+python-oslo.messaging (8.1.3-1) unstable; urgency=medium
+
+  * New upstream point release, which includes this fix:
+    - Retry to declare a queue after internal error.
+    everything else in this upstream release is cosmetic Git management.
+
+ -- Thomas Goirand <z...@debian.org>  Fri, 17 May 2019 14:33:29 +0200
+
 python-oslo.messaging (8.1.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru python-oslo.messaging-8.1.2/.gitreview 
python-oslo.messaging-8.1.3/.gitreview
--- python-oslo.messaging-8.1.2/.gitreview      2018-08-22 21:53:09.000000000 
+0200
+++ python-oslo.messaging-8.1.3/.gitreview      2019-04-23 09:50:41.000000000 
+0200
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/oslo.messaging.git
 defaultbranch=stable/rocky
diff -Nru python-oslo.messaging-8.1.2/oslo_messaging/_drivers/impl_rabbit.py 
python-oslo.messaging-8.1.3/oslo_messaging/_drivers/impl_rabbit.py
--- python-oslo.messaging-8.1.2/oslo_messaging/_drivers/impl_rabbit.py  
2018-08-22 21:53:09.000000000 +0200
+++ python-oslo.messaging-8.1.3/oslo_messaging/_drivers/impl_rabbit.py  
2019-04-23 09:50:41.000000000 +0200
@@ -270,7 +270,6 @@
         self.nowait = nowait
         self.queue_arguments = _get_queue_arguments(rabbit_ha_queues,
                                                     rabbit_queue_ttl)
-
         self.queue = None
         self._declared_on = None
         self.exchange = kombu.entity.Exchange(
@@ -305,6 +304,28 @@
                 self.queue.declare()
             else:
                 raise
+        except kombu.exceptions.ConnectionError as exc:
+            # NOTE(gsantomaggio): This exception happens when the
+            # connection is established,but it fails to create the queue.
+            # Add some delay to avoid too many requests to the server.
+            # See: https://bugs.launchpad.net/oslo.messaging/+bug/1822778
+            # for details.
+            if exc.code == 541:
+                interval = 2
+                info = {'sleep_time': interval,
+                        'queue': self.queue_name,
+                        'err_str': exc
+                        }
+                LOG.error(_LE('Internal amqp error (541) '
+                              'during queue declare,'
+                              'retrying in %(sleep_time)s seconds. '
+                              'Queue: [%(queue)s], '
+                              'error message: [%(err_str)s]'), info)
+                time.sleep(interval)
+                self.queue.declare()
+            else:
+                raise
+
         self._declared_on = conn.channel
 
     def consume(self, conn, tag):
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-src-grenade-dsvm/run.yaml 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-src-grenade-dsvm/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-src-grenade-dsvm/run.yaml  
    2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-src-grenade-dsvm/run.yaml  
    2019-04-23 09:50:41.000000000 +0200
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -27,7 +27,7 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_GRENADE=pullup
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-src-grenade-dsvm-multinode/run.yaml
 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-src-grenade-dsvm-multinode/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-src-grenade-dsvm-multinode/run.yaml
    2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-src-grenade-dsvm-multinode/run.yaml
    2019-04-23 09:50:41.000000000 +0200
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -28,7 +28,7 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_GRENADE=pullup
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
      2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
      2019-04-23 09:50:41.000000000 +0200
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -37,16 +37,16 @@
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko 
openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
           export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
git://git.openstack.org/openstack/panko"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
git://git.openstack.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
git://git.openstack.org/openstack/aodh"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
git://git.openstack.org/openstack/heat"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
https://opendev.org/openstack/panko";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
https://opendev.org/openstack/ceilometer";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
https://opendev.org/openstack/aodh";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
https://opendev.org/openstack/heat";
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-amqp1 https://opendev.org/openstack/devstack-plugin-amqp1";
           export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
               cd 
/opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
      2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
      2019-04-23 09:50:41.000000000 +0200
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -37,15 +37,15 @@
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko 
openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
           export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
git://git.openstack.org/openstack/panko"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
git://git.openstack.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
git://git.openstack.org/openstack/aodh"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
git://git.openstack.org/openstack/heat"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
https://opendev.org/openstack/panko";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
https://opendev.org/openstack/ceilometer";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
https://opendev.org/openstack/aodh";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
https://opendev.org/openstack/heat";
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-kafka https://opendev.org/openstack/devstack-plugin-kafka";
           export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
               cd 
/opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
     2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
     2019-04-23 09:50:41.000000000 +0200
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -36,10 +36,10 @@
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko 
openstack/telemetry-tempest-plugin openstack/heat-tempest-plugin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
git://git.openstack.org/openstack/panko"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
git://git.openstack.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
git://git.openstack.org/openstack/aodh"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
git://git.openstack.org/openstack/heat"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
https://opendev.org/openstack/panko";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
https://opendev.org/openstack/ceilometer";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
https://opendev.org/openstack/aodh";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
https://opendev.org/openstack/heat";
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
diff -Nru 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml
 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml
--- 
python-oslo.messaging-8.1.2/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml
        2018-08-22 21:53:09.000000000 +0200
+++ 
python-oslo.messaging-8.1.3/playbooks/oslo.messaging-telemetry-dsvm-integration-zmq/run.yaml
        2019-04-23 09:50:41.000000000 +0200
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -42,19 +42,19 @@
 
           case "$ZUUL_BRANCH" in
               "stable/ocata")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi 
git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
git://git.openstack.org/openstack/panko"
+                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi 
https://git.openstack.org/openstack/gnocchi";
+                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
https://git.openstack.org/openstack/panko";
                   export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1"
                   export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
                   ;;
               *)
-                export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
git://git.openstack.org/openstack/panko"
+                export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko 
https://git.openstack.org/openstack/panko";
                 export PROJECTS="openstack/panko $PROJECTS"
                 ;;
           esac
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
git://git.openstack.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
git://git.openstack.org/openstack/aodh"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
git://git.openstack.org/openstack/heat"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer 
https://git.openstack.org/openstack/ceilometer";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh 
https://git.openstack.org/openstack/aodh";
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat 
https://git.openstack.org/openstack/heat";
 
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
 
@@ -62,7 +62,7 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file"
 
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-zmq git://git.openstack.org/openstack/devstack-plugin-zmq"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin 
devstack-plugin-zmq https://git.openstack.org/openstack/devstack-plugin-zmq";
 
           export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
 
diff -Nru 
python-oslo.messaging-8.1.2/releasenotes/notes/amqp-tls-issue-7e6cc523e267f336.yaml
 
python-oslo.messaging-8.1.3/releasenotes/notes/amqp-tls-issue-7e6cc523e267f336.yaml
--- 
python-oslo.messaging-8.1.2/releasenotes/notes/amqp-tls-issue-7e6cc523e267f336.yaml
 1970-01-01 01:00:00.000000000 +0100
+++ 
python-oslo.messaging-8.1.3/releasenotes/notes/amqp-tls-issue-7e6cc523e267f336.yaml
 2019-04-23 09:50:41.000000000 +0200
@@ -0,0 +1,17 @@
+---
+issues:
+  - |
+    A bug in the ``amqp`` python library can cause the connection to the
+    RabbitMQ broker to hang when using SSL/TLS. This results in
+    frequent errors such as this::
+
+      MessagingTimeout: Timed out waiting for a reply to message ID 
ae039d1695984addbfaaef032ce4fda3
+
+    (see `bug 1800957
+    <https://bugs.launchpad.net/oslo.messaging/+bug/1800957>`_).
+
+    This bug has been fixed in `v2.4.1 of amqp
+    
<https://github.com/celery/py-amqp/commit/bf122a05a21a8cc5bca314b0979f32c8026fc66e>`_.
+
+    It is recommended that deployments using SSL/TLS upgrade the amqp
+    library to v2.4.1 or later.
diff -Nru python-oslo.messaging-8.1.2/.zuul.yaml 
python-oslo.messaging-8.1.3/.zuul.yaml
--- python-oslo.messaging-8.1.2/.zuul.yaml      2018-08-22 21:53:09.000000000 
+0200
+++ python-oslo.messaging-8.1.3/.zuul.yaml      2019-04-23 09:50:41.000000000 
+0200
@@ -75,7 +75,7 @@
       devstack_localrc:
         AMQP1_SERVICE: qpid-hybrid
       devstack_plugins:
-        devstack-plugin-amqp1: 
git://git.openstack.org/openstack/devstack-plugin-amqp1
+        devstack-plugin-amqp1: 
https://opendev.org/openstack/devstack-plugin-amqp1
       zuul_copy_output:
         '{{ devstack_base_dir }}/logs/qdrouterd.log': logs
 
@@ -100,7 +100,7 @@
       - openstack/devstack-plugin-kafka
     vars:
       devstack_plugins:
-        devstack-plugin-kafka: 
git://git.openstack.org/openstack/devstack-plugin-kafka
+        devstack-plugin-kafka: 
https://opendev.org/openstack/devstack-plugin-kafka
       zuul_copy_output:
         '{{ devstack_base_dir }}/logs/qdrouterd.log': logs
 
@@ -125,8 +125,8 @@
     post-run: playbooks/oslo.messaging-src-grenade-dsvm/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/oslo.messaging
     irrelevant-files:
       - ^(test-|)requirements.txt$
@@ -139,8 +139,8 @@
     post-run: playbooks/oslo.messaging-src-grenade-dsvm-multinode/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/oslo.messaging
     irrelevant-files:
       - ^(test-|)requirements.txt$
@@ -155,7 +155,7 @@
     post-run: 
playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
       - openstack/devstack-plugin-amqp1
@@ -177,7 +177,7 @@
     post-run: 
playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
       - openstack/devstack-plugin-kafka
@@ -199,7 +199,7 @@
     post-run: 
playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/aodh
       - openstack/ceilometer
       - openstack/oslo.messaging
@@ -243,7 +243,8 @@
         - oslo.messaging-src-grenade-dsvm-multinode:
             voting: false
 
-        - oslo.messaging-telemetry-dsvm-integration-rabbit
+        - oslo.messaging-telemetry-dsvm-integration-rabbit:
+            voting: false
         - oslo.messaging-telemetry-dsvm-integration-amqp1:
             voting: false
         - oslo.messaging-telemetry-dsvm-integration-kafka:
@@ -255,7 +256,6 @@
       jobs:
         - oslo.messaging-tox-py27-func-rabbit
         - oslo.messaging-src-dsvm-full-rabbit
-        - oslo.messaging-telemetry-dsvm-integration-rabbit
         - openstack-tox-lower-constraints
     templates:
       - openstack-python-jobs

Reply via email to