From 0d65744779b452b785294c0b75d8d3b64ee40e59 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Mon, 14 Jan 2019 12:06:08 -0600 Subject: [PATCH] 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 --- .zuul.yaml | 31 ------------- .../gate/playbooks/airship-armada-check.yaml | 22 ---------- tools/gate/playbooks/osh-infra-build.yaml | 36 ---------------- .../playbooks/osh-infra-collect-logs.yaml | 30 ------------- .../playbooks/osh-infra-deploy-docker.yaml | 43 ------------------- .../gate/playbooks/osh-infra-deploy-k8s.yaml | 36 ---------------- .../playbooks/osh-infra-upgrade-host.yaml | 41 ------------------ tools/gate/scripts/010-build-charts.sh | 19 -------- 8 files changed, 258 deletions(-) delete mode 100644 tools/gate/playbooks/airship-armada-check.yaml delete mode 100644 tools/gate/playbooks/osh-infra-build.yaml delete mode 100644 tools/gate/playbooks/osh-infra-collect-logs.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/osh-infra-upgrade-host.yaml delete mode 100755 tools/gate/scripts/010-build-charts.sh diff --git a/.zuul.yaml b/.zuul.yaml index 755b4856..492effe2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,7 +21,6 @@ check: jobs: - openstack-tox-pep8 - - airship-armada-ubuntu - airship-armada-docker-build-gate gate: jobs: @@ -31,36 +30,6 @@ jobs: - airship-armada-docker-publish -- job: - name: airship-armada - roles: - - zuul: openstack/openstack-helm-infra - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - timeout: 7200 - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/airship-armada-check.yaml - post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml - required-projects: - - openstack/openstack-helm-infra - -- job: - name: airship-armada-ubuntu - parent: airship-armada - nodeset: openstack-helm-single-node - voting: false - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^armada/tests/unit/.*$ - - nodeset: name: airship-armada-single-node nodes: diff --git a/tools/gate/playbooks/airship-armada-check.yaml b/tools/gate/playbooks/airship-armada-check.yaml deleted file mode 100644 index 89cbd90d..00000000 --- a/tools/gate/playbooks/airship-armada-check.yaml +++ /dev/null @@ -1,22 +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 - tasks: - - name: Build Charts - shell: | - set -xe; - ./tools/gate/scripts/010-build-charts.sh - args: - 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 d06296c1..00000000 --- a/tools/gate/playbooks/osh-infra-build.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 - tags: - - build-helm-packages - -- 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: - - build-images - tags: - - 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 f08f7066..00000000 --- a/tools/gate/playbooks/osh-infra-collect-logs.yaml +++ /dev/null @@ -1,30 +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: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - logs_dir: "/tmp/logs" - roles: - - gather-host-logs - - helm-release-status - - describe-kubernetes-objects - - gather-pod-logs - - gather-prom-metrics - tags: - - gather-host-logs - - helm-release-status - - describe-kubernetes-objects - - gather-pod-logs - - 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 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 5dc2ddeb..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 \ 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 495b5cb9..00000000 --- a/tools/gate/playbooks/osh-infra-upgrade-host.yaml +++ /dev/null @@ -1,41 +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: - - upgrade-host - - start-zuul-console - - disable-local-nameserver - tags: - - upgrade-host - - start-zuul-console - - 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 878f54ae..00000000 --- a/tools/gate/scripts/010-build-charts.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -make charts