summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gorshunov <roman.gorshunov@att.com>2018-11-12 13:00:13 +0100
committerRoman Gorshunov <roman.gorshunov@att.com>2018-11-12 15:13:56 +0000
commit1c082392871b129cf193aebd687ed2a3e16e4a32 (patch)
treec2081cb30dc3e0a11809890bbf22dd5145e8333e
parent7f3286b523104ad4de1a073f5c953511795530ff (diff)
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
Notes
Notes (review): Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+2: Bryan Strassner <bryan.strassner@gmail.com> Workflow+1: Bryan Strassner <bryan.strassner@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 12 Nov 2018 16:51:43 +0000 Reviewed-on: https://review.openstack.org/617300 Project: openstack/airship-shipyard Branch: refs/heads/master
-rw-r--r--.zuul.yaml14
-rw-r--r--tools/gate/playbooks/osh-infra-build.yaml24
-rw-r--r--tools/gate/playbooks/osh-infra-deploy-docker.yaml43
-rw-r--r--tools/gate/playbooks/osh-infra-deploy-k8s.yaml36
-rw-r--r--tools/gate/playbooks/security-bandit.yaml20
5 files changed, 0 insertions, 137 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index df0bb4d..f8a019a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -79,16 +79,9 @@
79 name: airship-shipyard-image-base 79 name: airship-shipyard-image-base
80 description: | 80 description: |
81 Base job for running airship-shipyard image related jobs. 81 Base job for running airship-shipyard image related jobs.
82 roles:
83 - zuul: openstack/openstack-helm-infra
84 timeout: 3600 82 timeout: 3600
85 pre-run:
86 - tools/gate/playbooks/osh-infra-upgrade-host.yaml
87 - tools/gate/playbooks/osh-infra-deploy-docker.yaml
88 run: tools/gate/playbooks/run-image.yaml 83 run: tools/gate/playbooks/run-image.yaml
89 nodeset: airship-shipyard-single-node 84 nodeset: airship-shipyard-single-node
90 required-projects:
91 - openstack/openstack-helm-infra
92 irrelevant-files: 85 irrelevant-files:
93 - ^.*\.rst$ 86 - ^.*\.rst$
94 - ^doc/.*$ 87 - ^doc/.*$
@@ -108,15 +101,8 @@
108- job: 101- job:
109 name: airship-shipyard-docker-build-post 102 name: airship-shipyard-docker-build-post
110 timeout: 1800 103 timeout: 1800
111 roles:
112 - zuul: openstack/openstack-helm-infra
113 pre-run:
114 - tools/gate/playbooks/osh-infra-upgrade-host.yaml
115 - tools/gate/playbooks/osh-infra-deploy-docker.yaml
116 run: tools/gate/playbooks/run-image.yaml 104 run: tools/gate/playbooks/run-image.yaml
117 nodeset: airship-shipyard-single-node 105 nodeset: airship-shipyard-single-node
118 required-projects:
119 - openstack/openstack-helm-infra
120 irrelevant-files: 106 irrelevant-files:
121 - ^.*\.rst$ 107 - ^.*\.rst$
122 - ^doc/.*$ 108 - ^doc/.*$
diff --git a/tools/gate/playbooks/osh-infra-build.yaml b/tools/gate/playbooks/osh-infra-build.yaml
deleted file mode 100644
index 1999000..0000000
--- a/tools/gate/playbooks/osh-infra-build.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
1# Copyright 2017 The Openstack-Helm Authors.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- hosts: primary
16 vars_files:
17 - vars.yaml
18 vars:
19 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
20 gather_facts: True
21 roles:
22 - build-helm-packages
23 tags:
24 - 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 7bf66fa..0000000
--- a/tools/gate/playbooks/osh-infra-deploy-docker.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
1# Copyright 2017 The Openstack-Helm Authors.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- hosts: all
16 vars_files:
17 - vars.yaml
18 vars:
19 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
20 gather_facts: False
21 become: yes
22 roles:
23 - deploy-python
24 tags:
25 - deploy-python
26
27- hosts: all
28 vars_files:
29 - vars.yaml
30 vars:
31 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
32 gather_facts: True
33 become: yes
34 roles:
35 - setup-firewall
36 - deploy-python-pip
37 - deploy-docker
38 - deploy-jq
39 tags:
40 - setup-firewall
41 - deploy-python-pip
42 - deploy-docker
43 - 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 c6d630a..0000000
--- a/tools/gate/playbooks/osh-infra-deploy-k8s.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
1# Copyright 2017 The Openstack-Helm Authors.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- hosts: primary
16 vars_files:
17 - vars.yaml
18 vars:
19 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
20 gather_facts: True
21 roles:
22 - build-helm-packages
23 - deploy-kubeadm-aio-master
24 tags:
25 - build-helm-packages
26 - deploy-kubeadm-aio-master
27
28- hosts: nodes
29 vars_files:
30 - vars.yaml
31 vars:
32 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
33 roles:
34 - deploy-kubeadm-aio-node
35 tags:
36 - 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 927ea05..0000000
--- a/tools/gate/playbooks/security-bandit.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
1# Licensed under the Apache License, Version 2.0 (the "License");
2# you may not use this file except in compliance with the License.
3# You may obtain a copy of the License at
4#
5# http://www.apache.org/licenses/LICENSE-2.0
6#
7# Unless required by applicable law or agreed to in writing, software
8# distributed under the License is distributed on an "AS IS" BASIS,
9# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10# See the License for the specific language governing permissions and
11# limitations under the License.
12
13- hosts: primary
14 tasks:
15 - name: Execute the make target for security scanning
16 make:
17 chdir: "{{ zuul.project.src_dir }}"
18 target: security
19 register: result
20 failed_when: result.failed