summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Walters <drewwalters96@gmail.com>2019-01-14 12:06:08 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-01-17 09:52:58 -0600
commit0d65744779b452b785294c0b75d8d3b64ee40e59 (patch)
tree5b112383fbd49b4beda3309a45bc8a2c3bbf8ed8
parente6f294bacb0295c98d588fffb3640e31a9eea6e2 (diff)
CI: Remove OpenStack-Helm-Infra CI job
Currently, the airship-armada-ubuntu job deploys K8s using outdated playbooks. The job fails due to a change [0] that introduced an AppArmor requirement to Calico. This change removes the failing job, as its success does not depend on changes in Armada. In the future, jobs requiring K8s should be deployed using playbooks from Airship-Treasuremap [1]. [0] https://review.openstack.org/614805 [1] https://git.openstack.org/cgit/openstack/airship-treasuremap/tree/tools/deployment/airskiff/developer/010-deploy-k8s.sh Change-Id: I40dc1e0ccfd956c157a6bef60f106eb9c5e9ca04
Notes
Notes (review): Code-Review+2: Sean Eagan <sean.eagan@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Code-Review+2: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 18 Jan 2019 22:40:16 +0000 Reviewed-on: https://review.openstack.org/630752 Project: openstack/airship-armada Branch: refs/heads/master
-rw-r--r--.zuul.yaml31
-rw-r--r--tools/gate/playbooks/airship-armada-check.yaml22
-rw-r--r--tools/gate/playbooks/osh-infra-build.yaml36
-rw-r--r--tools/gate/playbooks/osh-infra-collect-logs.yaml30
-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/osh-infra-upgrade-host.yaml41
-rwxr-xr-xtools/gate/scripts/010-build-charts.sh19
8 files changed, 0 insertions, 258 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 755b485..492effe 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,7 +21,6 @@
21 check: 21 check:
22 jobs: 22 jobs:
23 - openstack-tox-pep8 23 - openstack-tox-pep8
24 - airship-armada-ubuntu
25 - airship-armada-docker-build-gate 24 - airship-armada-docker-build-gate
26 gate: 25 gate:
27 jobs: 26 jobs:
@@ -31,36 +30,6 @@
31 jobs: 30 jobs:
32 - airship-armada-docker-publish 31 - airship-armada-docker-publish
33 32
34- job:
35 name: airship-armada
36 roles:
37 - zuul: openstack/openstack-helm-infra
38 vars:
39 zuul_osh_infra_relative_path: ../openstack-helm-infra/
40 timeout: 7200
41 pre-run:
42 - tools/gate/playbooks/osh-infra-upgrade-host.yaml
43 - tools/gate/playbooks/osh-infra-deploy-docker.yaml
44 - tools/gate/playbooks/osh-infra-build.yaml
45 - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
46 run: tools/gate/playbooks/airship-armada-check.yaml
47 post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
48 required-projects:
49 - openstack/openstack-helm-infra
50
51- job:
52 name: airship-armada-ubuntu
53 parent: airship-armada
54 nodeset: openstack-helm-single-node
55 voting: false
56 irrelevant-files:
57 - ^.*\.rst$
58 - ^doc/.*$
59 - ^etc/.*$
60 - ^releasenotes/.*$
61 - ^setup.cfg$
62 - ^armada/tests/unit/.*$
63
64- nodeset: 33- nodeset:
65 name: airship-armada-single-node 34 name: airship-armada-single-node
66 nodes: 35 nodes:
diff --git a/tools/gate/playbooks/airship-armada-check.yaml b/tools/gate/playbooks/airship-armada-check.yaml
deleted file mode 100644
index 89cbd90..0000000
--- a/tools/gate/playbooks/airship-armada-check.yaml
+++ /dev/null
@@ -1,22 +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 tasks:
17 - name: Build Charts
18 shell: |
19 set -xe;
20 ./tools/gate/scripts/010-build-charts.sh
21 args:
22 chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/osh-infra-build.yaml b/tools/gate/playbooks/osh-infra-build.yaml
deleted file mode 100644
index d06296c..0000000
--- a/tools/gate/playbooks/osh-infra-build.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 tags:
24 - build-helm-packages
25
26- hosts: all
27 vars_files:
28 - vars.yaml
29 vars:
30 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
31 gather_facts: False
32 become: yes
33 roles:
34 - build-images
35 tags:
36 - build-images
diff --git a/tools/gate/playbooks/osh-infra-collect-logs.yaml b/tools/gate/playbooks/osh-infra-collect-logs.yaml
deleted file mode 100644
index f08f706..0000000
--- a/tools/gate/playbooks/osh-infra-collect-logs.yaml
+++ /dev/null
@@ -1,30 +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:
17 work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
18 logs_dir: "/tmp/logs"
19 roles:
20 - gather-host-logs
21 - helm-release-status
22 - describe-kubernetes-objects
23 - gather-pod-logs
24 - gather-prom-metrics
25 tags:
26 - gather-host-logs
27 - helm-release-status
28 - describe-kubernetes-objects
29 - gather-pod-logs
30 - gather-prom-metrics \ No newline at end of file
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 5dc2dde..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 \ No newline at end of file
diff --git a/tools/gate/playbooks/osh-infra-upgrade-host.yaml b/tools/gate/playbooks/osh-infra-upgrade-host.yaml
deleted file mode 100644
index 495b5cb..0000000
--- a/tools/gate/playbooks/osh-infra-upgrade-host.yaml
+++ /dev/null
@@ -1,41 +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 - upgrade-host
36 - start-zuul-console
37 - disable-local-nameserver
38 tags:
39 - upgrade-host
40 - start-zuul-console
41 - disable-local-nameserver
diff --git a/tools/gate/scripts/010-build-charts.sh b/tools/gate/scripts/010-build-charts.sh
deleted file mode 100755
index 878f54a..0000000
--- a/tools/gate/scripts/010-build-charts.sh
+++ /dev/null
@@ -1,19 +0,0 @@
1#!/bin/bash
2
3# Copyright 2017 The Openstack-Helm Authors.
4#
5# Licensed under the Apache License, Version 2.0 (the "License"); you may
6# not use this file except in compliance with the License. You may obtain
7# a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14# License for the specific language governing permissions and limitations
15# under the License.
16
17set -xe
18
19make charts