Merge "Prune docker images periodically from build servers"

[releng.git] / jjb / dovetail / dovetail-ci-jobs.yml

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 91362ef..1dd1795 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -17,12 +17,14 @@
     master: &master
         stream: master
         branch: '{stream}'
+        dovetail-branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
     colorado: &colorado
         stream: colorado
         branch: 'stable/{stream}'
-        gs-pathname: '{stream}'
+        dovetail-branch: master
+        gs-pathname: '/{stream}'
         docker-tag: 'latest'
 
 #-----------------------------------
@@ -131,7 +133,7 @@
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
-            description: 'Tag to pull docker image'
+            description: 'Tag to pull dovetail docker image'
         - string:
             name: CI_DEBUG
             default: 'true'
@@ -141,7 +143,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: '{branch}'
+            branch: '{dovetail-branch}'
 
     builders:
         - description-setter:
@@ -149,6 +151,12 @@
         - 'dovetail-cleanup'
         - 'dovetail-{testsuite}'
 
+    publishers:
+        - archive:
+            artifacts: 'results/**/*'
+            allow-empty: true
+            fingerprint: true
+
 ########################
 # builder macros
 ########################