From c3081eaec5acb1659c2e88cd143e38de901d9bde Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Wed, 17 Apr 2019 16:19:31 +0000 Subject: [PATCH] CI: Add airsloop site linting gate This commit adds a site linting gate for the new airsloop site. Additionally, this change aims to standardize the names of all gates and creates a parent job for site linting gates. Change-Id: Ia8fa428909adf09c584540cfe4e5803bd3ca2420 --- .zuul.yaml | 103 ++++++++++++------ .../airship-seaworthy-site-lint.yaml | 23 ---- ...airskiff-site-lint.yaml => site-lint.yaml} | 4 +- 3 files changed, 70 insertions(+), 60 deletions(-) delete mode 100644 tools/gate/playbooks/airship-seaworthy-site-lint.yaml rename tools/gate/playbooks/{airskiff-site-lint.yaml => site-lint.yaml} (91%) diff --git a/.zuul.yaml b/.zuul.yaml index 5a98b8b94..b08a3a64b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -17,14 +17,16 @@ rtd_webhook_id: '47687' check: jobs: - - airship-seaworthy-site-lint-gate - - airskiff-site-lint-gate - - airskiff-deploy-gate + - airship-treasuremap-airship-seaworthy-site-lint + - airship-treasuremap-airskiff-site-lint + - airship-treasuremap-airsloop-site-lint + - airship-treasuremap-airskiff-deployment gate: jobs: - - airship-seaworthy-site-lint-gate - - airskiff-site-lint-gate - - airskiff-deploy-gate + - airship-treasuremap-airship-seaworthy-site-lint + - airship-treasuremap-airskiff-site-lint + - airship-treasuremap-airsloop-site-lint + - airship-treasuremap-airskiff-deployment - nodeset: name: airship-treasuremap-single-node @@ -33,7 +35,64 @@ label: ubuntu-xenial - job: - name: airskiff-deploy-gate + name: airship-treasuremap-site-lint + description: + Lint a site using Pegleg. Default site is airship-seaworthy. + nodeset: airship-treasuremap-single-node + timeout: 900 + pre-run: + - tools/gate/playbooks/install-docker.yaml + - tools/gate/playbooks/git-config.yaml + run: tools/gate/playbooks/site-lint.yaml + required-projects: + - openstack/airship-pegleg + vars: + site: airship-seaworthy + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + +- job: + name: airship-treasuremap-airship-seaworthy-site-lint + description: | + Lint the airship-seaworthy site using Pegleg. + parent: airship-treasuremap-site-lint + vars: + site: airship-seaworthy + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^site/airskiff/.*$ + - ^site/airsloop/.*$ + +- job: + name: airship-treasuremap-airskiff-site-lint + description: | + Lint the airskiff site using Pegleg. + parent: airship-treasuremap-site-lint + vars: + site: airskiff + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^site/airship-seaworthy/.*$ + - ^site/airsloop/.*$ + +- job: + name: airship-treasuremap-airsloop-site-lint + description: | + Lint the airsloop site using Pegleg. + parent: airship-treasuremap-site-lint + vars: + site: airsloop + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^site/airship-seaworthy/.*$ + - ^site/airskiff/.*$ + +- job: + name: airship-treasuremap-airskiff-deployment nodeset: airship-treasuremap-single-node description: | Deploy Memcached using Airskiff and latest Treasuremap changes. @@ -52,31 +111,5 @@ irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - -- job: - name: airship-seaworthy-site-lint-gate - nodeset: airship-treasuremap-single-node - timeout: 900 - pre-run: - - tools/gate/playbooks/install-docker.yaml - - tools/gate/playbooks/git-config.yaml - run: tools/gate/playbooks/airship-seaworthy-site-lint.yaml - required-projects: - - openstack/airship-pegleg - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - -- job: - name: airskiff-site-lint-gate - nodeset: airship-treasuremap-single-node - timeout: 900 - pre-run: - - tools/gate/playbooks/install-docker.yaml - - tools/gate/playbooks/git-config.yaml - run: tools/gate/playbooks/airskiff-site-lint.yaml - required-projects: - - openstack/airship-pegleg - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ + - ^site/airship-seaworthy/.*$ + - ^site/airsloop/.*$ diff --git a/tools/gate/playbooks/airship-seaworthy-site-lint.yaml b/tools/gate/playbooks/airship-seaworthy-site-lint.yaml deleted file mode 100644 index d26bcf3bc..000000000 --- a/tools/gate/playbooks/airship-seaworthy-site-lint.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All other rights reserved. -# -# 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: ubuntu-xenial - tasks: - - name: Lint airship-seaworthy site - shell: | - set -xe; - ./tools/gate/lint-site.sh airship-seaworthy - args: - chdir: "{{ zuul.project.src_dir }}" - become: yes diff --git a/tools/gate/playbooks/airskiff-site-lint.yaml b/tools/gate/playbooks/site-lint.yaml similarity index 91% rename from tools/gate/playbooks/airskiff-site-lint.yaml rename to tools/gate/playbooks/site-lint.yaml index 062e8fa51..a19e79a86 100644 --- a/tools/gate/playbooks/airskiff-site-lint.yaml +++ b/tools/gate/playbooks/site-lint.yaml @@ -14,10 +14,10 @@ - hosts: ubuntu-xenial tasks: - - name: Lint airskiff site + - name: Lint site shell: | set -xe; - ./tools/gate/lint-site.sh airskiff + ./tools/gate/lint-site.sh "{{ site }}" args: chdir: "{{ zuul.project.src_dir }}" become: yes