set +x around sensitive code docker login code

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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0749529..2bff633 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -18,7 +18,7 @@
 - job-group:
     name: '{project-name}-packer-jobs'
 
-    packer-version: 1.1.1
+    packer-version: 1.1.3
 
     jobs:
       - gerrit-packer-merge
@@ -28,7 +28,7 @@
 - job-group:
     name: '{project-name}-github-packer-jobs'
 
-    packer-version: 1.1.1
+    packer-version: 1.1.3
 
     jobs:
       - github-packer-merge
@@ -58,13 +58,14 @@
 - lf_packer_file_paths: &lf_packer_file_paths
     name: lf-packer-file-paths
     file-paths:
-      # Common files for all projects
       - compare-type: ANT
         pattern: 'packer/vars/{platforms}.json'
       - compare-type: ANT
         pattern: 'packer/templates/{templates}.json'
       - compare-type: ANT
-        pattern: 'packer/provision/{templates}.sh'
+        pattern: 'packer/provision/*.sh'
+      - compare-type: ANT
+        pattern: 'packer/provision/{templates}.yaml'
       - compare-type: ANT
         pattern: 'packer/provision/lib/**'
 
@@ -77,7 +78,7 @@
     ######################
 
     branch: master
-    build-timeout: 45
+    build-timeout: 90
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -263,7 +264,7 @@
     stream: master
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
-          comment-contains-value: jjb-deploy (?!\*+$).+$
+          comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
 
     #####################
     # Job Configuration #