From 9cb04c8a479acc4e67891bdf425c62afae7445fa Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 23 Aug 2018 18:47:00 -0400 Subject: [PATCH] Add option to disable-job for all jobs Add option to all jobs to allow disabling the job. CLM will has this setting set to "true" while we figure out the CLM issues however for all other jobs "false" is default. Change-Id: I9db6e8603a7d968aacf0eae17dea3554d6c97429 Signed-off-by: Thanh Ha --- jjb/lf-c-cpp-jobs.yaml | 4 ++++ jjb/lf-ci-jobs.yaml | 16 ++++++++++++++++ jjb/lf-maven-jobs.yaml | 23 +++++++++++++++++++++-- jjb/lf-node-jobs.yaml | 2 ++ jjb/lf-python-jobs.yaml | 10 ++++++++-- jjb/lf-rtd-jobs.yaml | 6 ++++++ 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml index 5e854484..3584bf16 100644 --- a/jjb/lf-c-cpp-jobs.yaml +++ b/jjb/lf-c-cpp-jobs.yaml @@ -16,6 +16,7 @@ build-timeout: 15 cmake-opts: '' cron: '@daily' + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' install-prefix: '$BUILD_DIR/output' @@ -32,6 +33,7 @@ project-type: freestyle node: '{build-node}' + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -179,6 +181,7 @@ build-dir: '$WORKSPACE/target' build-timeout: 15 cmake-opts: '' + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' install-prefix: '$BUILD_DIR/output' @@ -210,6 +213,7 @@ project-type: freestyle node: '{build-node}' + disabled: '{disable-job}' properties: - lf-infra-properties: diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 4fd2c0c8..f9aff908 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -77,6 +77,7 @@ branch: master build-timeout: 90 cron: '@monthly' + disable-job: false github-url: 'https://github.com' stream: master submodule-recursive: true @@ -89,6 +90,7 @@ project-type: freestyle node: '{build-node}' + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -137,6 +139,7 @@ branch: master build-timeout: 10 + disable-job: false github-url: 'https://github.com' jjb-version: 2.2.1 stream: master @@ -171,6 +174,7 @@ project-type: freestyle node: '{build-node}' + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -207,6 +211,7 @@ ###################### branch: master + disable-job: false git-url: '$GIT_URL/$GERRIT_PROJECT' stream: master gerrit_merge_triggers: @@ -219,6 +224,7 @@ project-type: freestyle node: '{build-node}' + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -295,6 +301,7 @@ branch: master cron: '@daily' + disable-job: false git-url: '$GIT_URL/$GERRIT_PROJECT' github-url: 'https://github.com' jenkins-silos: production sandbox @@ -319,6 +326,7 @@ project-type: freestyle node: '{build-node}' concurrent: false + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -430,6 +438,7 @@ build-timeout: 30 # Run every Saturday at 08:00 UTC cron: '0 8 * * 6' + disable-job: false ##################### # Job Configuration # @@ -438,6 +447,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' parameters: - lf-infra-jjb-parameters: @@ -480,6 +490,7 @@ ###################### branch: master + disable-job: false # jjb-deploy should always clone $PROJECT regardless of what # $GERRIT_PROJECT triggered the job. git-url: '$GIT_URL/$PROJECT' @@ -496,6 +507,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -888,6 +900,7 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false file-patterns: > *.go *.groovy @@ -910,6 +923,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -1116,6 +1130,7 @@ build-days-to-keep: 7 build-timeout: 10 cron: '@daily' + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' openstack-cloud: vex @@ -1128,6 +1143,7 @@ project-type: freestyle node: '{build-node}' concurrent: false + disabled: '{disable-job}' properties: - lf-infra-properties: diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 57cec949..42dfafe2 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -159,6 +159,7 @@ branch: master build-days-to-keep: 30 # 30 days for troubleshooting purposes build-timeout: 60 + disable-job: true git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -202,6 +203,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-maven-install: mvn-version: '{mvn-version}' @@ -229,7 +232,6 @@ # yamllint disable-line rule:key-duplicates <<: *lf_maven_clm - disabled: true scm: - lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -264,7 +266,6 @@ # yamllint disable-line rule:key-duplicates <<: *lf_maven_clm - disabled: true properties: - lf-infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -310,6 +311,7 @@ branch: master build-days-to-keep: 30 # 30 days in case a release takes long to get approved. build-timeout: 60 + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -329,6 +331,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-maven-install: mvn-version: '{mvn-version}' @@ -430,6 +434,7 @@ branch: master build-days-to-keep: 30 # 30 days in case a release takes long to get approved. build-timeout: 60 + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -454,6 +459,7 @@ ##################### concurrent: true + disabled: '{disable-job}' builders: - lf-maven-install: @@ -542,6 +548,7 @@ build-days-to-keep: 30 # 30 days in case we need to troubleshoot build-timeout: 60 cron: '@daily' + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -573,6 +580,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-jacoco-nojava-workaround - lf-maven-install: @@ -687,6 +696,7 @@ build-days-to-keep: 30 # 30 days in case a release takes long to get approved. build-timeout: 60 cron: '@daily' + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -706,6 +716,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: - lf-infra-parameters: project: '{project}' @@ -821,6 +833,7 @@ build-days-to-keep: 7 build-timeout: 60 cron: 'H H * * 6' # run weekly + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -840,6 +853,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: - lf-infra-parameters: project: '{project}' @@ -971,6 +986,7 @@ branch: master build-days-to-keep: 7 build-timeout: 60 + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -1004,6 +1020,7 @@ ##################### concurrent: true + disabled: '{disable-job}' builders: - lf-jacoco-nojava-workaround @@ -1100,6 +1117,7 @@ branch: master build-days-to-keep: 7 build-timeout: 60 + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -1123,6 +1141,7 @@ ##################### concurrent: true + disabled: '{disable-job}' builders: - lf-jacoco-nojava-workaround diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml index 79f11248..77eb8004 100644 --- a/jjb/lf-node-jobs.yaml +++ b/jjb/lf-node-jobs.yaml @@ -33,6 +33,7 @@ branch: master build-days-to-keep: 7 build-timeout: 10 + disable-job: false git-url: '$GIT_URL/$GERRIT_PROJECT' github-url: 'https://github.com' node-dir: '' @@ -54,6 +55,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' properties: - lf-infra-properties: diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index c5f67fe2..02e323e2 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -92,6 +92,7 @@ branch: master build-days-to-keep: 30 # 30 days for troubleshooting purposes build-timeout: 60 + disable-job: true git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -111,6 +112,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: - lf-infra-parameters: project: '{project}' @@ -141,7 +144,6 @@ # yamllint disable-line rule:key-duplicates <<: *lf_python_xc_clm - disabled: true ###################### # Default parameters # ###################### @@ -189,7 +191,6 @@ # yamllint disable-line rule:key-duplicates <<: *lf_python_xc_clm - disabled: true properties: - lf-infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -233,6 +234,7 @@ build-days-to-keep: 7 build-timeout: 60 cron: 'H H * * *' # run daily + disable-job: false git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' java-version: openjdk8 @@ -256,6 +258,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: - lf-infra-parameters: project: '{project}' @@ -410,6 +414,7 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false git-url: '$GIT_URL/$GERRIT_PROJECT' github-url: 'https://github.com' parallel: true @@ -434,6 +439,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' properties: - lf-infra-properties: diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 74d38278..16409187 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -82,6 +82,7 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false git-url: https://github.com github-url: 'https://github.com' project-pattern: '**' @@ -97,6 +98,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-rtd-trigger-build: rtd-build-url: '{rtd-build-url}' @@ -167,6 +170,7 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false doc-dir: docs/_build/html git-url: '$GIT_URL/$PROJECT' github-url: 'https://github.com' @@ -187,6 +191,8 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-rtd-verify: doc-dir: '{doc-dir}' -- 2.16.6