Zuul gates cleanup and fixes
1. Removed osh-infra-upgrade-host playbook from image building jobs, as non-relevant 2. Removed osh-infra-deploy-docker playbook from image building jobs, as docker-ce is deployed in run-image playbook 3. Removed osh-infra-build, osh-infra-deploy-k8s and security-bandit playbooks - they are not referenced anywhere; bandit has already been merged with pep8 job Change-Id: I27f0fd8f346d0b52c55870b6005be525a1fec671
This commit is contained in:
parent
7f3286b523
commit
1c08239287
14
.zuul.yaml
14
.zuul.yaml
|
@ -79,16 +79,9 @@
|
||||||
name: airship-shipyard-image-base
|
name: airship-shipyard-image-base
|
||||||
description: |
|
description: |
|
||||||
Base job for running airship-shipyard image related jobs.
|
Base job for running airship-shipyard image related jobs.
|
||||||
roles:
|
|
||||||
- zuul: openstack/openstack-helm-infra
|
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
pre-run:
|
|
||||||
- tools/gate/playbooks/osh-infra-upgrade-host.yaml
|
|
||||||
- tools/gate/playbooks/osh-infra-deploy-docker.yaml
|
|
||||||
run: tools/gate/playbooks/run-image.yaml
|
run: tools/gate/playbooks/run-image.yaml
|
||||||
nodeset: airship-shipyard-single-node
|
nodeset: airship-shipyard-single-node
|
||||||
required-projects:
|
|
||||||
- openstack/openstack-helm-infra
|
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
|
@ -108,15 +101,8 @@
|
||||||
- job:
|
- job:
|
||||||
name: airship-shipyard-docker-build-post
|
name: airship-shipyard-docker-build-post
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
roles:
|
|
||||||
- zuul: openstack/openstack-helm-infra
|
|
||||||
pre-run:
|
|
||||||
- tools/gate/playbooks/osh-infra-upgrade-host.yaml
|
|
||||||
- tools/gate/playbooks/osh-infra-deploy-docker.yaml
|
|
||||||
run: tools/gate/playbooks/run-image.yaml
|
run: tools/gate/playbooks/run-image.yaml
|
||||||
nodeset: airship-shipyard-single-node
|
nodeset: airship-shipyard-single-node
|
||||||
required-projects:
|
|
||||||
- openstack/openstack-helm-infra
|
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
|
|
|
@ -1,24 +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
|
|
||||||
vars_files:
|
|
||||||
- vars.yaml
|
|
||||||
vars:
|
|
||||||
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
|
||||||
gather_facts: True
|
|
||||||
roles:
|
|
||||||
- build-helm-packages
|
|
||||||
tags:
|
|
||||||
- build-helm-packages
|
|
|
@ -1,43 +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: all
|
|
||||||
vars_files:
|
|
||||||
- vars.yaml
|
|
||||||
vars:
|
|
||||||
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
|
||||||
gather_facts: False
|
|
||||||
become: yes
|
|
||||||
roles:
|
|
||||||
- deploy-python
|
|
||||||
tags:
|
|
||||||
- deploy-python
|
|
||||||
|
|
||||||
- hosts: all
|
|
||||||
vars_files:
|
|
||||||
- vars.yaml
|
|
||||||
vars:
|
|
||||||
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
|
||||||
gather_facts: True
|
|
||||||
become: yes
|
|
||||||
roles:
|
|
||||||
- setup-firewall
|
|
||||||
- deploy-python-pip
|
|
||||||
- deploy-docker
|
|
||||||
- deploy-jq
|
|
||||||
tags:
|
|
||||||
- setup-firewall
|
|
||||||
- deploy-python-pip
|
|
||||||
- deploy-docker
|
|
||||||
- deploy-jq
|
|
|
@ -1,36 +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
|
|
||||||
vars_files:
|
|
||||||
- vars.yaml
|
|
||||||
vars:
|
|
||||||
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
|
||||||
gather_facts: True
|
|
||||||
roles:
|
|
||||||
- build-helm-packages
|
|
||||||
- deploy-kubeadm-aio-master
|
|
||||||
tags:
|
|
||||||
- build-helm-packages
|
|
||||||
- deploy-kubeadm-aio-master
|
|
||||||
|
|
||||||
- hosts: nodes
|
|
||||||
vars_files:
|
|
||||||
- vars.yaml
|
|
||||||
vars:
|
|
||||||
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
|
|
||||||
roles:
|
|
||||||
- deploy-kubeadm-aio-node
|
|
||||||
tags:
|
|
||||||
- deploy-kubeadm-aio-node
|
|
|
@ -1,20 +0,0 @@
|
||||||
# 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: Execute the make target for security scanning
|
|
||||||
make:
|
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
|
||||||
target: security
|
|
||||||
register: result
|
|
||||||
failed_when: result.failed
|
|
Loading…
Reference in New Issue