Fix Deckhand integration test gates

Fix problems with integration test zuul jobs which were made non-voting
by [0] and restore them to voting status. These jobs exercise some
secret-management functions that test integration between Deckhand and
Barbican that doesn't happen in the Airskiff jobs, so they still have
some test value.

- Some integration test scripts were pointing to old versions of
  openstack-helm scripts that are no longer maintained. This PS
  updates those scripts to point to current OSH scripts.

- Uplift openstack-helm-infra pin in helm_tk.sh to a recent
  version

- Add build-images to uwsgi test jobs to ensure airship_deckhand_path
  is set

[0]: https://review.opendev.org/660738

Change-Id: If83dead126307a98b44ad5d8f367a972c48a30d0
This commit is contained in:
Crank, Daniel (dc6350) 2019-04-25 15:14:23 -05:00
parent 416df18353
commit eadae6d7b1
9 changed files with 73 additions and 36 deletions

View File

@ -29,10 +29,8 @@
- deckhand-functional-docker-py35-opensuse
- deckhand-integration-uwsgi-py35:
voting: false
- deckhand-integration-docker-py35-ubuntu:
voting: false
- deckhand-integration-docker-py35-opensuse:
voting: false
- deckhand-integration-docker-py35-ubuntu
- deckhand-integration-docker-py35-opensuse
- deckhand-chart-build-gate
- deckhand-chart-build-latest-htk
- deckhand-docker-build-gate-ubuntu
@ -43,6 +41,8 @@
- deckhand-tox-py35-postgresql
- deckhand-functional-docker-py35-ubuntu
- deckhand-functional-docker-py35-opensuse
- deckhand-integration-docker-py35-ubuntu
- deckhand-integration-docker-py35-opensuse
- deckhand-chart-build-gate
- deckhand-docker-build-gate-ubuntu
- deckhand-docker-build-gate-opensuse

View File

@ -15,3 +15,4 @@ bandit==1.5.1
gabbi==1.35.1
pifpaf==2.1.2
oslotest==3.7.0
yq>=2.7.2

View File

@ -14,6 +14,7 @@
- hosts: all
roles:
- install-test-requirements
- build-images
- deploy-keystone-dependencies
- build-charts

View File

@ -20,7 +20,7 @@
- name: Deploy Required Packages
shell: |
set -xe;
./tools/deployment/developer/nfs/000-install-packages.sh
./tools/deployment/common/install-packages.sh
environment:
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
args:
@ -29,7 +29,7 @@
- name: Deploy Kubernetes
shell: |
set -xe;
./tools/deployment/developer/nfs/010-deploy-k8s.sh
./tools/deployment/common/deploy-k8s.sh
environment:
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
args:
@ -38,48 +38,48 @@
- name: Setup OS and Kubernetes Clients
shell: |
set -xe;
./tools/deployment/developer/nfs/020-setup-client.sh
./tools/deployment/common/setup-client.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy Ingress
shell: |
set -xe;
./tools/deployment/developer/nfs/030-ingress.sh
./tools/deployment/component/common/ingress.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy NFS
shell: |
set -xe;
./tools/deployment/developer/nfs/040-nfs-provisioner.sh
./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy MariaDB
shell: |
set -xe;
./tools/deployment/developer/nfs/050-mariadb.sh
./tools/deployment/component/common/mariadb.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy RabbitMQ
shell: |
set -xe;
./tools/deployment/developer/nfs/060-rabbitmq.sh
./tools/deployment/component/common/rabbitmq.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy Memcached
shell: |
set -xe;
./tools/deployment/developer/nfs/070-memcached.sh
./tools/deployment/component/common/memcached.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
- name: Deploy Keystone
shell: |
set -xe;
./tools/deployment/developer/nfs/080-keystone.sh
./tools/deployment/component/keystone/keystone.sh
args:
chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"

View File

@ -0,0 +1,28 @@
# Copyright 2019 AT&T Intellectual Property. All other rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Set modprobe br_netfilter
shell: |
set -xe;
sudo modprobe br_netfilter
- name: Install pip3 and gabbi
shell: |
set -xe;
apt-get install -y python-pip
pip install --upgrade pip
pip install -r test-requirements.txt
args:
chdir: "{{ zuul.project.src_dir }}"
become: yes

View File

@ -0,0 +1,15 @@
# Copyright 2019 AT&T Intellectual Property. All other rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- include: install-test-requirements.yaml

View File

@ -12,16 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Install pip3 and gabbi
shell: |
set -xe;
apt-get install -y python-pip
pip install --upgrade pip
pip install -r test-requirements.txt
args:
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Run Integration Tests with Docker
when: disable_keystone == false
block:

View File

@ -18,7 +18,7 @@
HELM=$1
HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
HTK_PATH=${HTK_PATH:-""}
HTK_STABLE_COMMIT=${HTK_COMMIT:-"200b5e902b3a176fbfbe669b6a10a254c9b50f5d"}
HTK_STABLE_COMMIT=${HTK_COMMIT:-"926348fe2476051f9ca825916db333f81c0139b7"}
BUILD_DIR=${BUILD_DIR:-$(mktemp -d)}
if [[ ! -z $(echo $http_proxy) ]]

View File

@ -46,29 +46,31 @@ function deploy_osh_keystone_barbican {
git clone https://git.openstack.org/openstack/openstack-helm.git ../openstack-helm
fi
cd ${OSH_INFRA_PATH}
# NOTE(fmontei): setup-host already sets up required host dependencies.
make dev-deploy setup-host
make dev-deploy k8s
cd ${OSH_PATH}
# Deploy required packages
./tools/deployment/common/install-packages.sh
# Deploy Kubernetes
sudo modprobe br_netfilter
./tools/deployment/common/deploy-k8s.sh
cd ${CURRENT_DIR}
sudo -H -E pip install -r test-requirements.txt
cd ${OSH_PATH}
# Setup clients on the host and assemble the charts
./tools/deployment/developer/common/020-setup-client.sh
# Setup clients on the host and assemble the charts
./tools/deployment/common/setup-client.sh
# Deploy the ingress controller
./tools/deployment/developer/common/030-ingress.sh
./tools/deployment/component/common/ingress.sh
# Deploy NFS Provisioner
./tools/deployment/developer/nfs/040-nfs-provisioner.sh
./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
# Deploy MariaDB
./tools/deployment/developer/nfs/050-mariadb.sh
./tools/deployment/component/common/mariadb.sh
# Deploy RabbitMQ
./tools/deployment/developer/nfs/060-rabbitmq.sh
./tools/deployment/component/common/rabbitmq.sh
# Deploy Memcached
./tools/deployment/developer/nfs/070-memcached.sh
./tools/deployment/component/common/memcached.sh
# Deploy Keystone
./tools/deployment/developer/nfs/080-keystone.sh
./tools/deployment/component/keystone/keystone.sh
deploy_barbican
}