From d2797ce9d83061a0732c05baf63c08cabe01e9bf Mon Sep 17 00:00:00 2001
From: Tully Foote <tfoote@osrfoundation.org>
Date: Thu, 5 Mar 2020 16:16:45 -0800
Subject: [PATCH] Reduce uniqueness of docker images to prevent continuous
 aggregation Fixes #747

Signed-off-by: Tully Foote <tfoote@osrfoundation.org>
---
 ros_buildfarm/templates/ci/ci_job.xml.em | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ros_buildfarm/templates/ci/ci_job.xml.em b/ros_buildfarm/templates/ci/ci_job.xml.em
index 520e5c9f6..d32c62288 100644
--- a/ros_buildfarm/templates/ci/ci_job.xml.em
+++ b/ros_buildfarm/templates/ci/ci_job.xml.em
@@ -157,7 +157,8 @@ parameters = [
         'sleep 1',
         '',
         '# create a unique dockerfile name prefix',
-        'export DOCKER_IMAGE_PREFIX=$(date +%s.%N)',
+        '[ -z "$EXECUTOR_NUMBER" ] && export EXECUTOR_NUMBER=0',
+        'export DOCKER_IMAGE_PREFIX=executor_$EXECUTOR_NUMBER',
         '',
         '# generate Dockerfile, build and run it',
         '# generating the Dockerfiles for the actual CI tasks',