summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Walters <drewwalters96@gmail.com>2019-01-14 12:32:09 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-01-28 09:20:17 -0600
commitebf4ee4785093cb49a38822585e6da84fb824ba3 (patch)
treea0c32e65bbf293b16fb8d7a8bfd73da69c46f0ef
parent1474d7856f93a1482e2a1f31fbfdff408bfd6b1c (diff)
CI: Remove OpenStack-Helm-Infra CI job
Currently, the airship-shipyard-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 Shipyard. In the future, jobs requiring K8s should be deployed using the new Minikube gate scripts from the OpenStack-Helm infra repository. They will be added in future changes once they are required. Additionally, a future change will introduce a Helm linting gate for charts hosted in the Shipyard repository. [0] https://review.openstack.org/614805 [1] https://git.openstack.org/cgit/openstack/openstack-helm-infra/tree/tools/deployment/common/005-deploy-k8s.sh Change-Id: I72aaff9050eab844ef0856794b059de14e2a4a28
Notes
Notes (review): Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Code-Review+2: Pete Birley <petebirley@gmail.com> Workflow+1: Pete Birley <petebirley@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 28 Jan 2019 17:25:37 +0000 Reviewed-on: https://review.openstack.org/630755 Project: openstack/airship-shipyard Branch: refs/heads/master
-rw-r--r--.zuul.yaml31
-rw-r--r--tools/gate/playbooks/osh-infra-collect-logs.yaml28
-rw-r--r--tools/gate/playbooks/osh-infra-upgrade-host.yaml41
-rwxr-xr-xtools/gate/scripts/000-environment-setup.sh32
-rwxr-xr-xtools/gate/scripts/010-build-charts.sh19
5 files changed, 0 insertions, 151 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index f8a019a..045d61a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,19 +21,11 @@
21 jobs: 21 jobs:
22 - openstack-tox-pep8 22 - openstack-tox-pep8
23 - airship-shipyard-linter 23 - airship-shipyard-linter
24 - airship-shipyard-ubuntu:
25 voting: false
26 - airship-shipyard-image 24 - airship-shipyard-image
27 gate: 25 gate:
28 jobs: 26 jobs:
29 - openstack-tox-pep8 27 - openstack-tox-pep8
30 - airship-shipyard-linter 28 - airship-shipyard-linter
31 # NOTE(portdirect): enable when voting enabled.
32 # - airship-shipyard-ubuntu:
33 # irrelevant-files:
34 # - ^.*\.rst$
35 # - ^doc/.*$
36 # - ^releasenotes/.*$
37 - airship-shipyard-image 29 - airship-shipyard-image
38 post: 30 post:
39 jobs: 31 jobs:
@@ -53,29 +45,6 @@
53 nodeset: airship-shipyard-single-node 45 nodeset: airship-shipyard-single-node
54 46
55- job: 47- job:
56 name: airship-shipyard-base
57 roles:
58 - zuul: openstack/openstack-helm-infra
59 vars:
60 zuul_osh_infra_relative_path: ../openstack-helm-infra/
61 timeout: 7200
62 pre-run:
63 - tools/gate/playbooks/osh-infra-upgrade-host.yaml
64 post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
65 required-projects:
66 - openstack/openstack-helm-infra
67 nodeset: airship-shipyard-single-node
68 irrelevant-files:
69 - ^.*\.rst$
70 - ^doc/.*$
71 - ^releasenotes/.*$
72
73- job:
74 name: airship-shipyard-ubuntu
75 parent: airship-shipyard-base
76 run: tools/gate/playbooks/airship-shipyard-check.yaml
77
78- job:
79 name: airship-shipyard-image-base 48 name: airship-shipyard-image-base
80 description: | 49 description: |
81 Base job for running airship-shipyard image related jobs. 50 Base job for running airship-shipyard image related jobs.
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 2cb0982..0000000
--- a/tools/gate/playbooks/osh-infra-collect-logs.yaml
+++ /dev/null
@@ -1,28 +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 tags:
25 - gather-host-logs
26 - helm-release-status
27 - describe-kubernetes-objects
28 - gather-pod-logs
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/000-environment-setup.sh b/tools/gate/scripts/000-environment-setup.sh
deleted file mode 100755
index f1160d8..0000000
--- a/tools/gate/scripts/000-environment-setup.sh
+++ /dev/null
@@ -1,32 +0,0 @@
1#!/bin/bash
2
3# Licensed under the Apache License, Version 2.0 (the "License"); you may
4# not use this file except in compliance with the License. You may obtain
5# 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, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# License for the specific language governing permissions and limitations
13# under the License.
14
15set -xe
16
17sudo apt-get update
18sudo apt-get install --no-install-recommends -y \
19 ca-certificates \
20 git \
21 make \
22 jq \
23 nmap \
24 curl \
25 uuid-runtime
26
27CURRENT_DIR="$(pwd)"
28: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
29cd ${OSH_INFRA_PATH}
30make dev-deploy setup-host
31make dev-deploy k8s
32cd ${CURRENT_DIR}
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