X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=4d5dd2e41d22defe477827ca2cd2e1b13d7671ea;hb=refs%2Ftags%2Fv0.40.1;hp=45691fbd52882bb05bcf94e40cc540716ab00409;hpb=ebf363ee455e93e1998ba1e5fa73d515213a06d3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 45691fbd..4d5dd2e4 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -11,15 +11,6 @@
             - file-id: jjbini
               target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
-- builder:
-    name: lf-infra-jjbini-sandbox
-    # TODO: Consolidate this into jjbini when JJB2.0 is available.
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: jjbini-sandbox
-              target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
-
 - lf_packer: &lf_packer_common
     name: lf-packer-common
     # Provide configuration common in packer jobs.
@@ -647,7 +638,7 @@
     builders:
       - lf-pip-install:
           pip-packages: jenkins-job-builder
-      - lf-infra-jjbini-sandbox
+      - lf-infra-jjbini
       - shell: !include-raw-escape: ../shell/jjb-deploy-job.sh
 
     publishers:
@@ -1449,7 +1440,8 @@
           platform: "{platforms}"
           template: "{templates}"
       - description-setter:
-          description: ".*Creating the image:(.*)"
+          regexp: '(\s+.*)(ZZCI\s+.*\d+-\d+\.\d+)'
+          description: 'Image: \2'
 
 - job-template:
     name: "{project-name}-packer-merge-{platforms}-{templates}"