X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=fbef3fae4774cfabea1323d52985791b6302a964;hb=5fe7f08ff027accd25c96df8bc3f88030f89ffb7;hp=29deacaf584283f7a374abfe746fb8ad3d690727;hpb=5c8d53b2aca8d051b3e20a21b6e6a88cc57a9930;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml index 29deacaf..fbef3fae 100644 --- a/jjb/lf-release-jobs.yaml +++ b/jjb/lf-release-jobs.yaml @@ -25,14 +25,6 @@ - lf-infra-properties: build-days-to-keep: 7 - parameters: - - lf-infra-parameters: - project: "{project}" - branch: "$GERRIT_BRANCH" - stream: "$GERRIT_BRANCH" - - lf-build-with-parameters-maven-release: - use-release-file: "{use-release-file}" - publishers: - lf-infra-publish @@ -61,7 +53,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: "^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$" ##################### # Job Configuration # @@ -69,8 +61,26 @@ disabled: "{disable-job}" + parameters: + - lf-infra-parameters: + project: "{project}" + branch: "$GERRIT_BRANCH" + stream: "$GERRIT_BRANCH" + - lf-build-with-parameters-maven-release: + use-release-file: "{use-release-file}" + builders: - lf-infra-pre-build + - conditional-step: + condition-kind: regex-match + regex: "^.*-docker-.*" + label: "{build-node}" + steps: + - lf-provide-maven-settings: + global-settings-file: "global-settings" + settings-file: "{mvn-settings}" + - shell: !include-raw-escape: ../shell/docker-login.sh + - lf-provide-maven-settings-cleanup - config-file-provider: files: - file-id: sigul-config @@ -119,8 +129,8 @@ - branch-compare-type: "ANT" branch-pattern: "**" file-paths: - - compare-type: ANT - pattern: "releases/*.yaml" + - compare-type: REG_EXP + pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)' skip-vote: successful: "{gerrit-skip-vote}" failed: "{gerrit-skip-vote}" @@ -155,8 +165,31 @@ disabled: "{disable-job}" + parameters: + - lf-infra-parameters: + project: "{project}" + branch: "$GERRIT_BRANCH" + stream: "$GERRIT_BRANCH" + - lf-build-with-parameters-maven-release: + use-release-file: "{use-release-file}" + - bool: + name: DRY_RUN + default: false + description: | + If DRY_RUN is enabled artifacts are not published. + builders: - lf-infra-pre-build + - conditional-step: + condition-kind: regex-match + regex: "^.*-docker-.*" + label: "{build-node}" + steps: + - lf-provide-maven-settings: + global-settings-file: "global-settings" + settings-file: "{mvn-settings}" + - shell: !include-raw-escape: ../shell/docker-login.sh + - lf-provide-maven-settings-cleanup - config-file-provider: files: - file-id: sigul-config @@ -205,5 +238,5 @@ - branch-compare-type: "ANT" branch-pattern: "**" file-paths: - - compare-type: ANT - pattern: "releases/*.yaml" + - compare-type: REG_EXP + pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'