From 1c082392871b129cf193aebd687ed2a3e16e4a32 Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Mon, 12 Nov 2018 13:00:13 +0100 Subject: [PATCH] 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 --- .zuul.yaml | 14 ------ tools/gate/playbooks/osh-infra-build.yaml | 24 ----------- .../playbooks/osh-infra-deploy-docker.yaml | 43 ------------------- .../gate/playbooks/osh-infra-deploy-k8s.yaml | 36 ---------------- tools/gate/playbooks/security-bandit.yaml | 20 --------- 5 files changed, 137 deletions(-) delete mode 100644 tools/gate/playbooks/osh-infra-build.yaml delete mode 100644 tools/gate/playbooks/osh-infra-deploy-docker.yaml delete mode 100644 tools/gate/playbooks/osh-infra-deploy-k8s.yaml delete mode 100644 tools/gate/playbooks/security-bandit.yaml diff --git a/.zuul.yaml b/.zuul.yaml index df0bb4d6..f8a019a0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -79,16 +79,9 @@ name: airship-shipyard-image-base description: | Base job for running airship-shipyard image related jobs. - roles: - - zuul: openstack/openstack-helm-infra 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 nodeset: airship-shipyard-single-node - required-projects: - - openstack/openstack-helm-infra irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -108,15 +101,8 @@ - job: name: airship-shipyard-docker-build-post 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 nodeset: airship-shipyard-single-node - required-projects: - - openstack/openstack-helm-infra irrelevant-files: - ^.*\.rst$ - ^doc/.*$ diff --git a/tools/gate/playbooks/osh-infra-build.yaml b/tools/gate/playbooks/osh-infra-build.yaml deleted file mode 100644 index 1999000e..00000000 --- a/tools/gate/playbooks/osh-infra-build.yaml +++ /dev/null @@ -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 diff --git a/tools/gate/playbooks/osh-infra-deploy-docker.yaml b/tools/gate/playbooks/osh-infra-deploy-docker.yaml deleted file mode 100644 index 7bf66fa2..00000000 --- a/tools/gate/playbooks/osh-infra-deploy-docker.yaml +++ /dev/null @@ -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 diff --git a/tools/gate/playbooks/osh-infra-deploy-k8s.yaml b/tools/gate/playbooks/osh-infra-deploy-k8s.yaml deleted file mode 100644 index c6d630ad..00000000 --- a/tools/gate/playbooks/osh-infra-deploy-k8s.yaml +++ /dev/null @@ -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 diff --git a/tools/gate/playbooks/security-bandit.yaml b/tools/gate/playbooks/security-bandit.yaml deleted file mode 100644 index 927ea05f..00000000 --- a/tools/gate/playbooks/security-bandit.yaml +++ /dev/null @@ -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