Merge "Gates: Simplify kolla image gates to use common deploy playbook"

This commit is contained in:
Zuul 2018-02-28 20:06:38 +00:00 committed by Gerrit Code Review
commit 16c6d31155
2 changed files with 7 additions and 185 deletions

View File

@ -69,7 +69,7 @@
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-kolla-deploy-ceph:
- openstack-helm-kolla-deploy-ceph-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
@ -96,7 +96,7 @@
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-kolla-deploy-ceph:
- openstack-helm-kolla-deploy-ceph-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
@ -111,6 +111,7 @@
name: openstack-helm-dev-deploy
timeout: 7200
vars:
osh_neutron_backend: openvswitch
zuul_osh_infra_relative_path: ../openstack-helm-infra/
pre-run:
- ../openstack-helm-infra/tools/gate/playbooks/osh-infra-upgrade-host.yaml
@ -121,15 +122,11 @@
- job:
name: openstack-helm-dev-deploy-ceph-ovs
vars:
osh_neutron_backend: openvswitch
parent: openstack-helm-dev-deploy
run: tools/gate/playbooks/dev-deploy-ceph.yaml
- job:
name: openstack-helm-dev-deploy-nfs-ovs
vars:
osh_neutron_backend: openvswitch
parent: openstack-helm-dev-deploy
run: tools/gate/playbooks/dev-deploy-nfs.yaml
@ -137,7 +134,6 @@
name: openstack-helm-dev-deploy-ceph-lb
vars:
osh_neutron_backend: linuxbridge
zuul_osh_infra_relative_path: ../openstack-helm-infra/
zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/backends/networking/linuxbridge.yaml
parent: openstack-helm-dev-deploy
run: tools/gate/playbooks/dev-deploy-ceph.yaml
@ -146,7 +142,6 @@
name: openstack-helm-dev-deploy-nfs-lb
vars:
osh_neutron_backend: linuxbridge
zuul_osh_infra_relative_path: ../openstack-helm-infra/
zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/backends/networking/linuxbridge.yaml
parent: openstack-helm-dev-deploy
run: tools/gate/playbooks/dev-deploy-nfs.yaml
@ -206,6 +201,8 @@
run: tools/gate/playbooks/ironic-deploy.yaml
- job:
name: openstack-helm-kolla-deploy-ceph
name: openstack-helm-kolla-deploy-ceph-ovs
vars:
zuul_osh_extra_helm_args_relative_path: --values=./tools/overrides/releases/newton/kolla.yaml
parent: openstack-helm-dev-deploy
run: tools/gate/playbooks/kolla-deploy-ceph.yaml
run: tools/gate/playbooks/dev-deploy-ceph.yaml

View File

@ -1,175 +0,0 @@
# Copyright 2017 The Openstack-Helm Authors.
#
# 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.
- hosts: primary
tasks:
- name: Deploy Required packages
shell: |
set -xe;
./tools/deployment/developer/ceph/000-install-packages.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Required packages
shell: |
set -xe;
./tools/deployment/developer/ceph/010-deploy-k8s.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Setup OS and K8s Clients
shell: |
set -xe;
./tools/deployment/developer/ceph/020-setup-client.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Ingress
shell: |
set -xe;
./tools/deployment/developer/ceph/030-ingress.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Ceph
shell: |
set -xe;
./tools/deployment/developer/ceph/040-ceph.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Ceph NS Activate
shell: |
set -xe;
./tools/deployment/developer/ceph/045-ceph-ns-activate.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Mariadb
shell: |
set -xe;
./tools/deployment/developer/ceph/050-mariadb.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy RabbitMQ
shell: |
set -xe;
./tools/deployment/developer/ceph/060-rabbitmq.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Memcached
shell: |
set -xe;
./tools/deployment/developer/ceph/070-memcached.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Keystone
shell: |
set -xe;
./tools/deployment/developer/ceph/080-keystone.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Heat
shell: |
set -xe;
./tools/deployment/developer/ceph/090-heat.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
# - name: Deploy Horizon
# shell: |
# set -xe;
# ./tools/deployment/developer/ceph/100-horizon.sh
# args:
# chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Keystone Endpoints and User management for CephRGW
shell: |
set -xe;
./tools/deployment/developer/ceph/110-ceph-radosgateway.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Glance
shell: |
set -xe;
./tools/deployment/developer/ceph/120-glance.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
# - name: Deploy Cinder
# shell: |
# set -xe;
# ./tools/deployment/developer/ceph/130-cinder.sh
# environment:
# OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
# args:
# chdir: "{{ zuul.project.src_dir }}"
- name: Deploy OpenvSwitch
shell: |
set -xe;
./tools/deployment/developer/ceph/140-openvswitch.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy Libvirt
shell: |
set -xe;
./tools/deployment/developer/ceph/150-libvirt.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy VM Compute Kit
shell: |
set -xe;
./tools/deployment/developer/ceph/160-compute-kit.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Setup Gateway
shell: |
set -xe;
./tools/deployment/developer/ceph/170-setup-gateway.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"
- name: Deploy use the cloud
shell: |
set -xe;
./tools/deployment/developer/ceph/900-use-it.sh
environment:
OSH_EXTRA_HELM_ARGS: "--values=./tools/overrides/releases/newton/kolla.yaml"
args:
chdir: "{{ zuul.project.src_dir }}"