From ebf4ee4785093cb49a38822585e6da84fb824ba3 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Mon, 14 Jan 2019 12:32:09 -0600 Subject: [PATCH] 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 --- .zuul.yaml | 31 -------------- .../playbooks/osh-infra-collect-logs.yaml | 28 ------------- .../playbooks/osh-infra-upgrade-host.yaml | 41 ------------------- tools/gate/scripts/000-environment-setup.sh | 32 --------------- tools/gate/scripts/010-build-charts.sh | 19 --------- 5 files changed, 151 deletions(-) delete mode 100644 tools/gate/playbooks/osh-infra-collect-logs.yaml delete mode 100644 tools/gate/playbooks/osh-infra-upgrade-host.yaml delete mode 100755 tools/gate/scripts/000-environment-setup.sh delete mode 100755 tools/gate/scripts/010-build-charts.sh diff --git a/.zuul.yaml b/.zuul.yaml index f8a019a0..045d61ad 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,19 +21,11 @@ jobs: - openstack-tox-pep8 - airship-shipyard-linter - - airship-shipyard-ubuntu: - voting: false - airship-shipyard-image gate: jobs: - openstack-tox-pep8 - airship-shipyard-linter - # NOTE(portdirect): enable when voting enabled. - # - airship-shipyard-ubuntu: - # irrelevant-files: - # - ^.*\.rst$ - # - ^doc/.*$ - # - ^releasenotes/.*$ - airship-shipyard-image post: jobs: @@ -52,29 +44,6 @@ run: tools/gate/playbooks/zuul-linter.yaml nodeset: airship-shipyard-single-node -- job: - name: airship-shipyard-base - 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 - post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml - required-projects: - - openstack/openstack-helm-infra - nodeset: airship-shipyard-single-node - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - -- job: - name: airship-shipyard-ubuntu - parent: airship-shipyard-base - run: tools/gate/playbooks/airship-shipyard-check.yaml - - job: name: airship-shipyard-image-base description: | 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 2cb0982d..00000000 --- a/tools/gate/playbooks/osh-infra-collect-logs.yaml +++ /dev/null @@ -1,28 +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 - tags: - - gather-host-logs - - helm-release-status - - describe-kubernetes-objects - - 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 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/000-environment-setup.sh b/tools/gate/scripts/000-environment-setup.sh deleted file mode 100755 index f1160d8f..00000000 --- a/tools/gate/scripts/000-environment-setup.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# 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 - -sudo apt-get update -sudo apt-get install --no-install-recommends -y \ - ca-certificates \ - git \ - make \ - jq \ - nmap \ - curl \ - uuid-runtime - -CURRENT_DIR="$(pwd)" -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -cd ${OSH_INFRA_PATH} -make dev-deploy setup-host -make dev-deploy k8s -cd ${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 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