Fix packer {cron} should be {obj:cron}

[releng/global-jjb.git] / jjb / lf-ci-jobs.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index b00b57e..8301b65 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -75,6 +75,7 @@
     branch: master
     build-timeout: 90
     cron: '@monthly'
+    github-url: 'https://github.com'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -134,6 +135,7 @@
 
     branch: master
     build-timeout: 10
+    github-url: 'https://github.com'
     jjb-version: 2.0.5
     stream: master
     submodule-recursive: true
@@ -292,6 +294,7 @@
     branch: master
     cron: '@daily'
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     jenkins-silos: production sandbox
 
     gerrit_merge_triggers:
@@ -380,7 +383,7 @@
           project: '{project}'
           build-days-to-keep: 1
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -407,6 +410,8 @@
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'
 
 ##################
 # JJB DEPLOY JOB #
@@ -423,6 +428,7 @@
     # jjb-deploy should always clone $PROJECT regardless of what
     # $GERRIT_PROJECT triggered the job.
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     stream: master
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
@@ -502,7 +508,7 @@
           project: '{project}'
           build-days-to-keep: 1
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -520,6 +526,8 @@
           status-context: 'JJB Deploy Job'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
 
 #############
 # JJB Merge #
@@ -594,7 +602,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -620,6 +628,8 @@
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'
 
 ##############
 # JJB Verify #
@@ -711,7 +721,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -730,6 +740,8 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'
 
 #################
 # License Check #
@@ -752,6 +764,7 @@
         *.py
         *.sh
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     lhc-version: 0.2.0
     license-exclude-paths: ''
     licenses-allowed: Apache-2.0,EPL-1.0,MIT
@@ -839,7 +852,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -858,6 +871,8 @@
           status-context: 'License Check'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
 
 ####################
 # Info YAML Verify #
@@ -929,9 +944,10 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_info_yaml_verify
 
+    github-url: 'https://github.com'
     properties:
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -951,6 +967,8 @@
           github-hooks: true
           # included-regions MUST match gerrit file-paths
           included-regions: 'INFO.yaml'
+          white-list-target-branches:
+            - '{branch}'
 
 ################
 # Packer Merge #
@@ -964,9 +982,6 @@
     #####################
 
     builders:
-      - lf-infra-packer-validate:
-          packer-cloud-settings: '{packer-cloud-settings}'
-          packer-version: '{packer-version}'
       - lf-infra-packer-build:
           packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
@@ -1005,7 +1020,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - timed: '{cron}'
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_merge_triggers}'
@@ -1047,7 +1062,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1059,7 +1074,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - timed: '{cron}'
+      - timed: '{obj:cron}'
       - github
       - pollscm:
           cron: ''
@@ -1083,6 +1098,8 @@
             - 'packer\/provision\/local-{templates}\.yaml'
             - 'packer\/templates\/{templates}\.json'
             - 'packer\/vars\/{platforms}\.json'
+          white-list-target-branches:
+            - '{branch}'
 
 #################
 # Packer Verify #
@@ -1179,7 +1196,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1198,3 +1215,5 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'