Fix: post job can not have files section

- Fix post job, which can not have files section
- Make jobs naming look more like in other Airship projects
- Use git grep in whitespace linter as simplier way to get list of
  files mathing pattern, than find & grep combination

Change-Id: Ie6c82855dd1513d6047160363f2d4606e69673d1
This commit is contained in:
Roman Gorshunov 2019-09-25 21:21:47 +02:00
parent 33ce528756
commit 01b105a114
3 changed files with 14 additions and 17 deletions

View File

@ -15,10 +15,8 @@
- hosts: primary - hosts: primary
tasks: tasks:
- name: Execute a Whitespace Linter check - name: Execute a Whitespace Linter check
command: > command: git grep -E -l " +$"
find . args:
-not -path "*/.git/*" chdir: "{{ zuul.project.src_dir }}"
-type f
-exec egrep -l " +$" {} \;
register: result register: result
failed_when: result.stdout != "" failed_when: result.stdout != ""

View File

@ -15,17 +15,17 @@
- project: - project:
check: check:
jobs: jobs:
- porthole-lint - airship-porthole-linter
- porthole-image-build-mysqlclient-utility - airship-porthole-images-build-gate-mysqlclient-utility
gate: gate:
jobs: jobs:
- porthole-lint - airship-porthole-linter
- porthole-image-build-mysqlclient-utility - airship-porthole-images-build-gate-mysqlclient-utility
post: post:
jobs: jobs:
- porthole-image-upload-mysqlclient-utility - airship-porthole-images-publish-mysqlclient-utility
- nodeset: - nodeset:
name: airship-porthole-single-node name: airship-porthole-single-node
@ -34,7 +34,7 @@
label: ubuntu-xenial label: ubuntu-xenial
- job: - job:
name: porthole-images name: airship-porthole-images
abstract: true abstract: true
timeout: 1800 timeout: 1800
post-timeout: 1800 post-timeout: 1800
@ -50,7 +50,7 @@
- latest - latest
- job: - job:
name: porthole-lint name: airship-porthole-linter
description: | description: |
Lints files for trailing whitespace Lints files for trailing whitespace
run: tools/gate/playbooks/zuul-linter.yaml run: tools/gate/playbooks/zuul-linter.yaml

View File

@ -13,12 +13,12 @@
# limitations under the License. # limitations under the License.
- job: - job:
name: porthole-image-build-mysqlclient-utility name: airship-porthole-images-build-gate-mysqlclient-utility
parent: &parent porthole-images parent: &parent airship-porthole-images
vars: vars:
image_name: &image_name mysqlclient-utility image_name: &image_name mysqlclient-utility
distro_suffix: &distro_suffix ubuntu_xenial distro_suffix: &distro_suffix ubuntu_xenial
files: &mysqlclient_files files:
- ^Dockerfiles/mysqlclient-utility/.*$ - ^Dockerfiles/mysqlclient-utility/.*$
- ^install_mysqlclient_utility.sh$ - ^install_mysqlclient_utility.sh$
- ^mysqlclient-utility/.*$ - ^mysqlclient-utility/.*$
@ -27,7 +27,7 @@
- ^zuul.d/.*$ - ^zuul.d/.*$
- job: - job:
name: porthole-image-upload-mysqlclient-utility name: airship-porthole-images-publish-mysqlclient-utility
parent: *parent parent: *parent
secrets: secrets:
- name: quay_credentials - name: quay_credentials
@ -40,4 +40,3 @@
tags: tags:
dynamic: dynamic:
commit: true commit: true
files: *mysqlclient_files