From: Jeremy Phelps Date: Wed, 13 Jun 2018 21:00:23 +0000 (+0000) Subject: Merge "Use include-regions to limit packer build paths" X-Git-Tag: v0.21.0~9 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=26d174d7d7acd639ea28e1b7d140fefdaa81171d;hp=08453751efb9b2737b05a03c9f1925435478db8d;p=releng%2Fglobal-jjb.git Merge "Use include-regions to limit packer build paths" --- diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index cc4399b9..db12af26 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -127,16 +127,21 @@ submodule-recursive: true gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**/*.groovy' - - compare-type: ANT - pattern: '**/*.sh' - - compare-type: ANT - pattern: '**/*.yml' - - compare-type: ANT - pattern: '**/*.yaml' - - compare-type: ANT - pattern: '**/global-jjb' + - compare-type: REG_EXP + pattern: '.*\.groovy' + - compare-type: REG_EXP + pattern: '.*\.sh' + - compare-type: REG_EXP + pattern: '.*\.(yaml|yml)' + - compare-type: REG_EXP + pattern: '.*\/global-jjb' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*\.groovy' + - '.*\.sh' + - '.*\.(yaml|yml)' + - '.*\/global-jjb' ##################### # Job Configuration # @@ -478,17 +483,12 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^jjb-deploy (?!\*+$).+$' only-trigger-phrase: true status-context: 'JJB Deploy Job' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' ############# # JJB Merge # @@ -554,6 +554,10 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_merge + ##################### + # Job Configuration # + ##################### + properties: - github: url: '{git-url}/{github-org}/{project}' @@ -571,15 +575,17 @@ - github - pollscm: cron: '' - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^remerge$' only-trigger-phrase: true status-context: 'JJB Merge' permit-all: false github-hooks: true - github-org: '{github-org}' - github_pr_whitelist: '{obj:github_pr_whitelist}' - github_pr_admin_list: '{obj:github_pr_admin_list}' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' ############## # JJB Verify # @@ -624,8 +630,16 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_verify + ###################### + # Default parameters # + ###################### + git-url: '$GIT_URL/$GERRIT_PROJECT' + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -654,6 +668,10 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_verify + ##################### + # Job Configuration # + ##################### + properties: - github: url: '{git-url}/{github-org}/{project}' @@ -668,17 +686,13 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^recheck$' only-trigger-phrase: false status-context: 'JJB Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}' ################ # Packer Merge # diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index ca948234..b1872a15 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -179,24 +179,6 @@ # Job Configuration # ##################### - triggers: - # Build weekly on Saturdays - - timed: 'H H * * 6' - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_clm_triggers}' - projects: - - project-compare-type: ANT - project-pattern: '{project}' - branches: - - branch-compare-type: ANT - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - builders: - lf-maven-install: mvn-version: '{mvn-version}' @@ -229,6 +211,24 @@ submodule-recursive: '{submodule-recursive}' choosing-strategy: default + triggers: + # Build weekly on Saturdays + - timed: 'H H * * 6' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_clm_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + - job-template: name: '{project-name}-maven-clm-{stream}' id: github-maven-clm @@ -250,17 +250,18 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + # Build weekly on Saturdays + - timed: 'H H * * 6' + - github-pull-request: trigger-phrase: '^run-clm$' only-trigger-phrase: false status-context: 'CLM' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' ######################### # Maven Javadoc Publish # @@ -367,15 +368,16 @@ - github - pollscm: cron: '' - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^remerge$' only-trigger-phrase: true - status-context: 'JJB Merge' + status-context: 'Maven Javadoc Publish' permit-all: false github-hooks: true - github-org: '{github-org}' - github_pr_whitelist: '{obj:github_pr_whitelist}' - github_pr_admin_list: '{obj:github_pr_admin_list}' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' ######################## # Maven Javadoc Verify # @@ -477,17 +479,12 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^recheck$' - only-trigger-phrase: true - status-context: 'Maven Javadoc' + only-trigger-phrase: false + status-context: 'Maven Javadoc Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' ############### # Maven Merge # @@ -522,8 +519,12 @@ comment-contains-value: remerge$ gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**' + - compare-type: REG_EXP + pattern: '.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*' post_build_trigger: '' @@ -610,17 +611,20 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github + - pollscm: + cron: '' + - github-pull-request: trigger-phrase: '^remerge$' - only-trigger-phrase: false + only-trigger-phrase: true status-context: 'Maven Merge' - permit-all: true + permit-all: false github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' ################# # Maven Release # @@ -724,17 +728,12 @@ triggers: - timed: '{obj:cron}' - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^build release$' only-trigger-phrase: true status-context: 'Maven Release' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' ############### # Maven Sonar # @@ -878,17 +877,12 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: - trigger-phrase: '^recheck$' + - github-pull-request: + trigger-phrase: '^run-sonar$' only-trigger-phrase: false - status-context: 'Maven Verify' + status-context: 'Maven Sonar' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' ################ # Maven Verify # @@ -924,8 +918,12 @@ - comment-added-contains-event: comment-contains-value: recheck$ gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**' + - compare-type: REG_EXP + pattern: '.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*' ##################### # Job Configuration # @@ -1002,17 +1000,13 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^recheck$' only-trigger-phrase: false status-context: 'Maven Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}' ############################# # Maven Verify Dependencies # diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 2b7ae8a7..3c21dbc5 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -25,10 +25,21 @@ ###################### gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**/*.rst' - - compare-type: ANT - pattern: '**/conf.py' + - compare-type: REG_EXP + pattern: '.*\.css' + - compare-type: REG_EXP + pattern: '.*\.html' + - compare-type: REG_EXP + pattern: '.*\.rst' + - compare-type: REG_EXP + pattern: '.*\/conf.py' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*\.css' + - '.*\.html' + - '.*\.rst' + - '.*\/conf.py' ##################### # Job Configuration # @@ -121,18 +132,21 @@ url: '{git-url}/{github-org}/{project}' triggers: - - lf-infra-github-pr-trigger: + - timed: 'H H * * *' + - github + - pollscm: + cron: '' + - github-pull-request: trigger-phrase: '^remerge$' - only-trigger-phrase: false + only-trigger-phrase: true status-context: 'RTD Merge' - permit-all: true + permit-all: false github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' - - timed: 'H H * * *' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' ############# # RTD VERIFY# @@ -222,14 +236,10 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^recheck$' only-trigger-phrase: false status-context: 'RTD Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}' diff --git a/shell/package-listing.sh b/shell/package-listing.sh index 0c35917e..b2afe33a 100644 --- a/shell/package-listing.sh +++ b/shell/package-listing.sh @@ -18,18 +18,19 @@ set -x # Trace commands for this script to make debugging easier OS_FAMILY=$(facter osfamily | tr '[:upper:]' '[:lower:]') +# Capture the CI WORKSPACE safely in the case that it doesn't exist +workspace="${WORKSPACE:-}" + START_PACKAGES=/tmp/packages_start.txt END_PACKAGES=/tmp/packages_end.txt DIFF_PACKAGES=/tmp/packages_diff.txt -# This script may be run during system boot, if that is true then there will be -# a starting_packages file. We will want to create a diff if we have a starting -# packages file +# Swap to creating END_PACKAGES if we are running in a CI job (determined by if +# we have a workspace env) or if the starting packages listing already exists. PACKAGES="${START_PACKAGES}" -if [ -f "${PACKAGES}" ] +if ( [ "${workspace}" ] || [ -f "${START_PACKAGES}" ] ) then PACKAGES="${END_PACKAGES}" - CREATEDIFF=1 fi case "${OS_FAMILY}" in @@ -46,15 +47,15 @@ case "${OS_FAMILY}" in ;; esac -if [ "${CREATEDIFF}" ] +if ( [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] ) then diff "${START_PACKAGES}" "${END_PACKAGES}" > "${DIFF_PACKAGES}" fi # If running in a Jenkins job, then copy the created files to the archives # location -if [ "${WORKSPACE}" ] +if [ "${workspace}" ] then - mkdir -p "${WORKSPACE}/archives/" - cp -f /tmp/packages_*.txt "${WORKSPACE}/archives/" + mkdir -p "${workspace}/archives/" + cp -f /tmp/packages_*.txt "${workspace}/archives/" fi