summaryrefslogtreecommitdiffstats
path: root/jjb/ci-management
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2018-09-28 14:21:07 -0500
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2018-09-28 14:56:51 -0500
commit8e74e612c8d22a70e433ff7f034c0c11ec96978b (patch)
tree93051e826f034a5945213240d9c590e23e978173 /jjb/ci-management
parent46be1e240856a33a330e4797244bb66eed95d6e9 (diff)
Fix lint errors
Fixing lint errors in preparation to convert ci-management jobs to global-jjb Change-Id: I530f347b463bdf1a8aa468170a998424a623066e Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-management')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml311
1 files changed, 156 insertions, 155 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index acd8ae868..cef4c9b1e 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,17 +1,18 @@
+---
- project:
name: ci-management-jobs
jobs:
- - 'ci-management-verify-jjb'
- - 'ci-management-merge-jjb'
- - 'ci-management-verify-packer'
- - 'ci-management-merge-packer-{platforms}-{templates}'
+ - 'ci-management-verify-jjb'
+ - 'ci-management-merge-jjb'
+ - 'ci-management-verify-packer'
+ - 'ci-management-merge-packer-{platforms}-{templates}'
platforms:
- - centos
- - ubuntu-16.04
+ - centos
+ - ubuntu-16.04
templates:
- - basebuild
+ - basebuild
project: ci-management
branch: master
@@ -24,41 +25,41 @@
concurrent: true
logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
+ daysToKeep: 30
+ numToKeep: 10
+ artifactDaysToKeep: -1
+ artifactNumToKeep: 5
parameters:
- - project-parameter:
- project: '{project}'
+ - project-parameter:
+ project: '{project}'
scm:
- - gerrit-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- - gerrit-trigger-patch-submitted:
- name: '{project}'
- branch: '{branch}'
+ - gerrit-trigger-patch-submitted:
+ name: '{project}'
+ branch: '{branch}'
builders:
- - shell: |
- jenkins-jobs test --recursive -o job_output jjb/
- - ci-management-check-unicode
+ - shell: |
+ jenkins-jobs test --recursive -o job_output jjb/
+ - ci-management-check-unicode
publishers:
- - archive-artifacts:
- artifacts: 'job_output/*'
+ - archive-artifacts:
+ artifacts: 'job_output/*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'ci-management-merge-jjb'
@@ -67,39 +68,39 @@
node: jjb
logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
+ daysToKeep: 30
+ numToKeep: 40
+ artifactDaysToKeep: -1
+ artifactNumToKeep: 5
parameters:
- - project-parameter:
- project: '{project}'
+ - project-parameter:
+ project: '{project}'
scm:
- - gerrit-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: ''
- choosing-strategy: 'default'
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: ''
+ choosing-strategy: 'default'
wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- - gerrit-trigger-patch-merged:
- name: '{project}'
- branch: '{branch}'
+ - gerrit-trigger-patch-merged:
+ name: '{project}'
+ branch: '{branch}'
builders:
- - shell: |
- pip freeze
- jenkins-jobs --version
- jenkins-jobs update --recursive --delete-old --workers 4 jjb/
+ - shell: |
+ pip freeze
+ jenkins-jobs --version
+ jenkins-jobs update --recursive --delete-old --workers 4 jjb/
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'ci-management-verify-packer'
@@ -108,67 +109,67 @@
concurrent: true
properties:
- - fdio-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- build-num-to-keep: '{build-num-to-keep}'
+ - fdio-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ build-num-to-keep: '{build-num-to-keep}'
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- - gerrit-refspec-parameter:
- refspec: 'refs/heads/{branch}'
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: 'refs/heads/{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: '$GERRIT_REFSPEC'
- branches:
- - '$GERRIT_BRANCH'
- choosing-strategy: 'gerrit'
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ branches:
+ - '$GERRIT_BRANCH'
+ choosing-strategy: 'gerrit'
wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ - ssh-agent-credentials:
+ users:
+ - 'jenkins-gerrit-credentials'
triggers:
- - timed: 'H H 1 * *'
- - gerrit:
- server-name: 'Primary'
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'true'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'ci-management'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- file-paths:
- - compare-type: ANT
- pattern: packer/**
+ - timed: 'H H 1 * *'
+ - gerrit:
+ server-name: 'Primary'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'true'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: 'ci-management'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/master'
+ file-paths:
+ - compare-type: ANT
+ pattern: packer/**
builders:
- - packer-validate:
+ - packer-validate:
publishers:
- - archive:
- artifacts: 'packer/*.log'
- allow-empty: 'true'
- only-if-success: 'true'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - archive:
+ artifacts: 'packer/*.log'
+ allow-empty: 'true'
+ only-if-success: 'true'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'ci-management-merge-packer-{platforms}-{templates}'
@@ -177,71 +178,71 @@
concurrent: true
properties:
- - fdio-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- build-num-to-keep: '{build-num-to-keep}'
+ - fdio-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ build-num-to-keep: '{build-num-to-keep}'
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- - gerrit-refspec-parameter:
- refspec: 'refs/heads/{branch}'
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: 'refs/heads/{branch}'
scm:
- - gerrit-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: '$GERRIT_REFSPEC'
- branches:
- - '$GERRIT_BRANCH'
- choosing-strategy: 'default'
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ branches:
+ - '$GERRIT_BRANCH'
+ choosing-strategy: 'default'
wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ - ssh-agent-credentials:
+ users:
+ - 'jenkins-gerrit-credentials'
triggers:
- - timed: 'H H 1 * *'
- - gerrit:
- server-name: 'Primary'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'ci-management'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- file-paths:
- - compare-type: ANT
- pattern: 'packer/vars/{platforms}.json'
- - compare-type: ANT
- pattern: 'packer/templates/{templates}.json'
- - compare-type: ANT
- pattern: 'packer/provision/{templates}.sh'
- - compare-type: ANT
- pattern: 'packer/provision/system_reseal.sh'
- - compare-type: ANT
- pattern: 'packer/provision/rh-user_data.sh'
- - compare-type: ANT
- pattern: 'packer/provision/baseline.sh'
+ - timed: 'H H 1 * *'
+ - gerrit:
+ server-name: 'Primary'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: 'ci-management'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/master'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'packer/vars/{platforms}.json'
+ - compare-type: ANT
+ pattern: 'packer/templates/{templates}.json'
+ - compare-type: ANT
+ pattern: 'packer/provision/{templates}.sh'
+ - compare-type: ANT
+ pattern: 'packer/provision/system_reseal.sh'
+ - compare-type: ANT
+ pattern: 'packer/provision/rh-user_data.sh'
+ - compare-type: ANT
+ pattern: 'packer/provision/baseline.sh'
builders:
- - packer-validate:
- - packer-build:
- platform: '{platforms}'
- template: '{templates}'
+ - packer-validate:
+ - packer-build:
+ platform: '{platforms}'
+ template: '{templates}'
publishers:
- - archive:
- artifacts: 'packer/*.log'
- allow-empty: 'true'
- only-if-success: 'true'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - archive:
+ artifacts: 'packer/*.log'
+ allow-empty: 'true'
+ only-if-success: 'true'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'