X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=45d8c48eea7baae1b788ed3f797321cd6dd5124b;hb=refs%2Ftags%2Fv0.86.6;hp=c2bb7492ec159f55cba799cbc48eba61a7b5ad47;hpb=c53e11db14ab7abede74c74801bec9ca381c8cc6;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml index c2bb7492..45d8c48e 100644 --- a/jjb/lf-release-jobs.yaml +++ b/jjb/lf-release-jobs.yaml @@ -11,7 +11,7 @@ # COMMON FUNCTIONS # #################### -- lf_release_common: &lf_release_common +- _lf_release_common: &lf_release_common name: lf-release-common ##################### @@ -32,7 +32,7 @@ # RELEASE VERIFY # ################## -- lf_release_verify: &lf_release_verify +- _lf_release_verify: &lf_release_verify name: lf-release-verify ###################### @@ -53,8 +53,11 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: | - ^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$ + # yamllint disable-line rule:line-length + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' + + github_included_regions: + - '(releases\/.*\.yaml|\.releases\/.*\.yaml)' ##################### # Job Configuration # @@ -138,11 +141,51 @@ unstable: "{gerrit-skip-vote}" notbuilt: "{gerrit-skip-vote}" +- job-template: + name: "{project-name}-release-verify" + id: github-release-verify + <<: *lf_release_common + # yamllint disable-line rule:key-duplicates + <<: *lf_release_verify + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + - github: + url: "{github-url}/{github-org}/{project}" + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + scm: + - lf-infra-github-scm: + url: "{git-clone-url}{github-org}/{project}" + refspec: "+refs/pull/*:refs/remotes/origin/pr/*" + branch: "$sha1" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + submodule-disable: "{submodule-disable}" + choosing-strategy: default + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + triggers: + - github-pull-request: + trigger-phrase: ^(recheck|reverify)$ + only-trigger-phrase: false + status-context: "Github Release Verify" + permit-all: true + github-hooks: true + white-list-target-branches: + - "{branch}" + included-regions: "{obj:github_included_regions}" + ################# # RELEASE MERGE # ################# -- lf_release_merge: &lf_release_merge +- _lf_release_merge: &lf_release_merge name: lf-release-merge ###################### @@ -158,7 +201,10 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' + + github_included_regions: + - '(releases\/.*\.yaml|\.releases\/.*\.yaml)' ##################### # Job Configuration # @@ -173,6 +219,11 @@ stream: "$GERRIT_BRANCH" - lf-build-with-parameters-maven-release: use-release-file: "{use-release-file}" + - bool: + name: TAG_RELEASE + default: true + description: | + Tag Gerrit repo after release. - bool: name: DRY_RUN default: false @@ -226,7 +277,8 @@ submodule-disable: true submodule-recursive: false submodule-timeout: 10 - choosing-strategy: default + # release merge jobs build from commit not tip + choosing-strategy: gerrit triggers: - gerrit: @@ -242,11 +294,51 @@ - compare-type: REG_EXP pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)' +- job-template: + name: "{project-name}-release-merge" + id: github-release-merge + <<: *lf_release_common + # yamllint disable-line rule:key-duplicates + <<: *lf_release_merge + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + - github: + url: "{github-url}/{github-org}/{project}" + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + scm: + - lf-infra-github-scm: + url: "{git-clone-url}{github-org}/{project}" + refspec: "+refs/pull/*:refs/remotes/origin/pr/*" + branch: "$sha1" + submodule-recursive: "{submodule-recursive}" + submodule-timeout: "{submodule-timeout}" + submodule-disable: "{submodule-disable}" + choosing-strategy: default + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + triggers: + - github-pull-request: + trigger-phrase: "^remerge$" + only-trigger-phrase: true + status-context: "Github Release Merge" + permit-all: true + github-hooks: true + white-list-target-branches: + - "{branch}" + included-regions: "{obj:github_included_regions}" + ################ # PyPI RELEASE # ################ -- lf_pypi_verify_wrappers: &lf_pypi_verify_wrappers +- _lf_pypi_verify_wrappers: &lf_pypi_verify_wrappers name: lf-pypi-verify-wrappers wrappers: @@ -254,7 +346,7 @@ build-timeout: "{build-timeout}" jenkins-ssh-credential: "{jenkins-ssh-credential}" -- lf_pypi_release_wrappers: &lf_pypi_release_wrappers +- _lf_pypi_release_wrappers: &lf_pypi_release_wrappers name: lf-pypi-release-wrappers wrappers: @@ -262,7 +354,7 @@ build-timeout: "{build-timeout}" jenkins-ssh-credential: "{jenkins-ssh-release-credential}" -- lf_pypi_release: &lf_pypi_release +- _lf_pypi_release: &lf_pypi_release name: lf-pypi-release ###################### @@ -286,13 +378,13 @@ # define once and use twice; jobs MUST NOT override gerrit_release_trigger_file_paths: - compare-type: REG_EXP - pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)' + pattern: '(releases\/pypi.*\.yaml|\.releases\/pypi.*\.yaml)' # yamllint disable-line rule:line-length # github_release_included_regions MUST match gerrit_release_trigger_file_paths github_release_included_regions: - - 'releases\/.*\.yaml' - - '.releases\/.*\.yaml' + - 'releases\/pypi.*\.yaml' + - '.releases\/pypi.*\.yaml' parameters: - lf-infra-parameters: @@ -308,6 +400,10 @@ name: LOG_DIR default: "" description: "The partial path of logs from the PyPI merge job." + - string: + name: GIT_TAG + default: "" + description: "Tag to push to git repo; optional, defaults to VERSION." - string: name: PYPI_PROJECT default: "" @@ -325,6 +421,11 @@ name: USE_RELEASE_FILE default: true description: "Set to False (unchecked) to build with parameters" + - bool: + name: TAG_RELEASE + default: true + description: | + Tag Gerrit repo after release. - bool: name: DRY_RUN default: false @@ -342,6 +443,8 @@ variable: SIGUL_PKI - file-id: signing-pubkey variable: SIGNING_PUBKEY + - file-id: pypirc + target: "$HOME/.pypirc" - shell: !include-raw-escape: ../shell/sigul-configuration.sh - shell: !include-raw-escape: ../shell/sigul-install.sh - inject: @@ -366,6 +469,7 @@ submodule-recursive: "{submodule-recursive}" submodule-timeout: "{submodule-timeout}" submodule-disable: "{submodule-disable}" + # release merge jobs build from commit not tip choosing-strategy: gerrit triggers: @@ -486,3 +590,162 @@ white-list-target-branches: - "{branch}" included-regions: "{obj:github_release_included_regions}" + +######################## +# PackageCloud RELEASE # +######################## + +- _lf_packagecloud_release_common: &lf_packagecloud_release_common + name: lf-packagecloud-release-common + + ###################### + # Default parameters # + ###################### + + build-days-to-keep: 7 + build-timeout: 15 + disable-job: false + git-url: "$GIT_URL/$PROJECT" + gerrit-skip-vote: false + use-release-file: true + account-name: "" + source-repo: "" + + ##################### + # Job Configuration # + ##################### + + disabled: "{disable-job}" + + parameters: + - lf-infra-parameters: + project: "{project}" + branch: "$GERRIT_BRANCH" + stream: "$GERRIT_BRANCH" + - string: + name: DISTRIBUTION_TYPE + default: "packagecloud" + description: "The Jenkins release job distribution type." + - bool: + name: TAG_RELEASE + default: true + description: | + Tag Gerrit repo after release. + - bool: + name: DRY_RUN + default: false + description: | + If DRY_RUN is enabled artifacts are not promoted. + - bool: + name: USE_RELEASE_FILE + default: "{use-release-file}" + description: "Set to False for job built with parameters" + + builders: + - lf-infra-pre-build + - config-file-provider: + files: + - file-id: sigul-config + variable: SIGUL_CONFIG + - file-id: sigul-password + variable: SIGUL_PASSWORD + - file-id: sigul-pki + variable: SIGUL_PKI + - file-id: signing-pubkey + variable: SIGNING_PUBKEY + - file-id: "packagecloud_api" + target: "$HOME/packagecloud_api" + - file-id: packagecloud-account + variable: ACCOUNT_NAME_FILE + - shell: !include-raw-escape: ../shell/sigul-configuration.sh + - shell: !include-raw-escape: ../shell/sigul-install.sh + - lf-release + +- job-template: + name: "{project-name}-packagecloud-release-verify" + id: gerrit-packagecloud-release-verify + <<: *lf_release_common + <<: *lf_packagecloud_release_common + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + scm: + - lf-infra-gerrit-scm: + git-url: "{git-url}" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-disable: true + submodule-recursive: false + submodule-timeout: 10 + choosing-strategy: gerrit + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + triggers: + - gerrit: + server-name: "{gerrit-server-name}" + trigger-on: + - patchset-created-event: + exclude-drafts: true + exclude-trivial-rebase: false + exclude-no-code-change: false + - draft-published-event + - comment-added-contains-event: + # yamllint disable-line rule:line-length + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' + projects: + - project-compare-type: "ANT" + project-pattern: "{project}" + branches: + - branch-compare-type: "ANT" + branch-pattern: "**" + file-paths: + - compare-type: REG_EXP + pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)' + skip-vote: + successful: "{gerrit-skip-vote}" + failed: "{gerrit-skip-vote}" + unstable: "{gerrit-skip-vote}" + notbuilt: "{gerrit-skip-vote}" + +- job-template: + name: "{project-name}-packagecloud-release-merge" + id: gerrit-packagecloud-release-merge + <<: *lf_release_common + <<: *lf_packagecloud_release_common + + wrappers: + - lf-infra-wrappers: + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-release-credential}" + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: "{jenkins-ssh-credential}" + git-url: "{git-url}" + refspec: "$GERRIT_REFSPEC" + branch: "$GERRIT_BRANCH" + submodule-disable: true + submodule-recursive: false + submodule-timeout: 10 + # release merge jobs build from commit not tip + choosing-strategy: gerrit + + triggers: + - gerrit: + server-name: "{gerrit-server-name}" + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' + projects: + - project-compare-type: "ANT" + project-pattern: "{project}" + branches: + - branch-compare-type: "ANT" + branch-pattern: "**" + file-paths: + - compare-type: REG_EXP + pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'