X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=c6961aee37b78810c9f2a3618f83952473970fe3;hb=a69fade94ac6b691666ceaa1c1801fff8b20f032;hp=e8c072b29e79ac24fefa99b2f16a0ffe28c7cbb2;hpb=5bae7cd8254aff34e1e3772769b6268ec913b5d6;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index e8c072b29..c6961aee3 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -258,7 +258,7 @@
                       unhealthy: 40
 
 - publisher:
-    name: archive-build
+    name: opendaylight-infra-shiplogs
     # To archive things the job will need to create a "archives" directory in
     # the workspace and this macro will handle copying the contents of the
     # archives directory.
@@ -290,19 +290,6 @@
         - workspace-cleanup:
             fail-build: false
 
-- builder:
-    name: opendaylight-infra-pre-builders
-    builders:
-        - shell: |
-            if [ ! -z "$GERRIT_PATCHSET_REVISION" ]; then
-                LOG_MESSAGE="
-                    Logs for $JOB_NAME:
-                    https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
-                    (note that logs will be unavailable until the job is completed running.)
-                "
-                ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit review -m \"${LOG_MESSAGE}\" $GERRIT_PATCHSET_REVISION
-            fi
-
 - builder:
     name: wipe-org-opendaylight-repo
     builders:
@@ -395,6 +382,7 @@
             timeout: '{build-timeout}'
             timeout-var: 'BUILD_TIMEOUT'
             fail: true
+        - timestamps
         - ssh-agent-credentials:
             users:
                 - 'opendaylight-jenkins-ssh'
@@ -402,3 +390,29 @@
             single-use: True
         - openstack:
             single-use: True
+
+- builder:
+    name: packer-validate
+    builders:
+        - config-file-provider:
+            files:
+                - file-id: 'packer-cloud-env'
+                  variable: 'CLOUDENV'
+        - shell: |
+            cd packer
+            export PACKER_LOG="yes" && \
+            export PACKER_LOG_PATH="packer-validate.log" && \
+                        packer.io validate -var-file=$CLOUDENV \
+                         -var-file=../packer/vars/{platform}.json \
+                         ../packer/templates/{template}.json
+
+- builder:
+    name: packer-build
+    builders:
+        - shell: |
+            cd packer
+            export PACKER_LOG="yes" && \
+            export PACKER_LOG_PATH="packer-build.log" && \
+                        packer.io build -var-file=$CLOUDENV \
+                         -var-file=../packer/vars/{platform}.json \
+                         ../packer/templates/{template}.json