X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=229b86e8aa6786c6de0e9d52d50814dd59526d4b;hb=2c01d1c4b9b284118e2854494366e76d41e447f8;hp=3cc37e9b80bc7aa9c0982337b6b60543e565b760;hpb=34564041cc71b59cd49543735b3adddc15792203;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 3cc37e9b..229b86e8 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
 
     ######################
@@ -44,6 +44,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    stream: master
     use-release-file: true
 
     gerrit_verify_triggers:
@@ -56,6 +57,9 @@
           # 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 #
     #####################
@@ -97,7 +101,7 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-verify"
+    name: "{project-name}-release-verify-{stream}"
     id: gerrit-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -128,7 +132,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
@@ -138,11 +142,51 @@
             unstable: "{gerrit-skip-vote}"
             notbuilt: "{gerrit-skip-vote}"
 
+- job-template:
+    name: "{project-name}-release-verify-{stream}"
+    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
 
     ######################
@@ -151,8 +195,11 @@
 
     build-days-to-keep: 7
     build-timeout: 15
+    cosign-password-id: cosign-password
+    cosign-private-key-id: cosign-private-key
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    stream: master
     use-release-file: true
 
     gerrit_merge_triggers:
@@ -160,6 +207,9 @@
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
+    github_included_regions:
+      - '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+
     #####################
     # Job Configuration #
     #####################
@@ -211,7 +261,7 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-merge"
+    name: "{project-name}-release-merge-{stream}"
     id: gerrit-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -221,6 +271,13 @@
       - lf-infra-wrappers:
           build-timeout: "{build-timeout}"
           jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+      - credentials-binding:
+          - file:
+              credential-id: "{cosign-private-key-id}"
+              variable: COSIGN_PRIVATE_KEY
+          - text:
+              credential-id: "{cosign-password-id}"
+              variable: COSIGN_PASSWORD
 
     scm:
       - lf-infra-gerrit-scm:
@@ -243,16 +300,63 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
 
+- job-template:
+    name: "{project-name}-release-merge-{stream}"
+    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}"
+      - credentials-binding:
+          - file:
+              credential-id: "{cosign-private-key-id}"
+              variable: COSIGN_PRIVATE_KEY
+          - text:
+              credential-id: "{cosign-password-id}"
+              variable: COSIGN_PASSWORD
+
+    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:
@@ -260,7 +364,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:
@@ -268,7 +372,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
 
     ######################
@@ -398,7 +502,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -469,7 +573,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -509,7 +613,7 @@
 # PackageCloud RELEASE #
 ########################
 
-- lf_packagecloud_release_common: &lf_packagecloud_release_common
+- _lf_packagecloud_release_common: &lf_packagecloud_release_common
     name: lf-packagecloud-release-common
 
     ######################
@@ -522,8 +626,8 @@
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
     use-release-file: true
-    account-name: "{account-name}"
-    source-repo: "{source-repo}"
+    account-name: ""
+    source-repo: ""
 
     #####################
     # Job Configuration #
@@ -614,7 +718,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
@@ -659,7 +763,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'