airship/deckhand
Code Issues Proposed changes

Gate fixes: pin amqp, use barbican deploy script

Browse Source 
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
This commit is contained in:
Phil Sphicas 2019-12-16 01:35:49 +00:00
parent 51dcea4fa1
commit fa15c0b582
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
amqp==2.5.1 amqp==2.5.2
coverage==4.5.1 coverage==4.5.1
fixtures==3.0.0 fixtures==3.0.0
python-subunit==1.3.0 python-subunit==1.3.0

4
tools/gate/playbooks/run-integration-tests-docker.yaml
View File

@ -17,8 +17,8 @@
- install-test-requirements - install-test-requirements
- build-images - build-images
- deploy-keystone-dependencies - deploy-keystone-dependencies
- build-charts
- deploy-barbican - deploy-barbican
- build-charts
# NOTE: deploy-postgresql and deploy-deckhand must follow # NOTE: deploy-postgresql and deploy-deckhand must follow
# deploy-keystone-dependencies which restarts Docker, causing # deploy-keystone-dependencies which restarts Docker, causing
# the first 2 containers that are deployed to fail. # the first 2 containers that are deployed to fail.
@ -29,8 +29,8 @@
tags: tags:
- build-images - build-images
- deploy-keystone-dependencies - deploy-keystone-dependencies
- build-charts
- deploy-barbican - deploy-barbican
- build-charts
- deploy-postgresql - deploy-postgresql
- generate-test-config - generate-test-config
- deploy-deckhand - deploy-deckhand

14
tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
View File

@ -15,19 +15,7 @@
- name: Deploy Barbican - name: Deploy Barbican
shell: | shell: |
set -xe; set -xe;
./tools/deployment/component/barbican/barbican.sh
# 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
args: args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}" chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"