From fa15c0b58232edda6199b90f7c7ce3f5138b770d Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Mon, 16 Dec 2019 01:35:49 +0000
Subject: [PATCH] Gate fixes: pin amqp, use barbican deploy script

tox is failing because oslo.messaging 9.1.1 installs kombu 4.6.7, which
requires amqp >=2.5.2, but it is pinned to 2.5.1. Additionally, the
deckhand-integration-docker are failing because barbican is not being
deployed correctly.

This change updated the pinned version of amqp to 2.5.2, and uses the
barbican deployment script in openstack-helm.

Depends-On: I020632ad6a33d29a657164cf0e32baef6b670d5a
Change-Id: Idafe35d1496cd880e2d6a93c96afa724fd1c2e89
---
 test-requirements.txt                              |  2 +-
 .../playbooks/run-integration-tests-docker.yaml    |  4 ++--
 .../deploy-barbican/tasks/deploy-barbican.yaml     | 14 +-------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 93bfaa82..9eda110f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-amqp==2.5.1
+amqp==2.5.2
 coverage==4.5.1
 fixtures==3.0.0
 python-subunit==1.3.0
diff --git a/tools/gate/playbooks/run-integration-tests-docker.yaml b/tools/gate/playbooks/run-integration-tests-docker.yaml
index 6cf84121..68f2d29b 100644
--- a/tools/gate/playbooks/run-integration-tests-docker.yaml
+++ b/tools/gate/playbooks/run-integration-tests-docker.yaml
@@ -17,8 +17,8 @@
     - install-test-requirements
     - build-images
     - deploy-keystone-dependencies
-    - build-charts
     - deploy-barbican
+    - build-charts
     # NOTE: deploy-postgresql and deploy-deckhand must follow
     # deploy-keystone-dependencies which restarts Docker, causing
     # the first 2 containers that are deployed to fail.
@@ -29,8 +29,8 @@
   tags:
     - build-images
     - deploy-keystone-dependencies
-    - build-charts
     - deploy-barbican
+    - build-charts
     - deploy-postgresql
     - generate-test-config
     - deploy-deckhand
diff --git a/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml b/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
index de330b67..19d14144 100644
--- a/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
+++ b/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
@@ -15,19 +15,7 @@
 - name: Deploy Barbican
   shell: |
     set -xe;
-
-    # Pull images and lint chart
-    make pull-images barbican
-
-    # Deploy command
-    helm upgrade --install barbican ./barbican \
-      --namespace=openstack
-
-    # Wait for deploy
-    ./tools/deployment/common/wait-for-pods.sh openstack
-
-    # Validate deployment info
-    helm status barbican
+    ./tools/deployment/component/barbican/barbican.sh
   args:
     chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"