refactoring: bring the name for the generated federation and k8s tests

images in line with the other jenkins images.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/jenkins/packer-images/jenkins-image-federation-tests.json b/jenkins/packer-images/jenkins-image-federation-tests.json
index 42ba0e2040156a572a3413ba719eebbe8d30470f..0b95270ee3a149571ee8bfaa1d12291df16e01f4 100644 (file)
--- a/jenkins/packer-images/jenkins-image-federation-tests.json
+++ b/jenkins/packer-images/jenkins-image-federation-tests.json
@@ -10,7 +10,7 @@
       "source_image": "debian-10-buster-v20200714",
       "zone": "us-central1-a",
       "disk_size": "10",
-      "image_name": "federation-jenkins-{{timestamp}}",
+      "image_name": "jenkins-image-federation-tests-{{isotime \"20060102150405\"}}",
       "image_family": "jenkins",
       "ssh_username": "jenkins"
     }

diff --git a/jenkins/packer-images/jenkins-image-k8s-tests.json b/jenkins/packer-images/jenkins-image-k8s-tests.json
index 89d2af3e646f7f2bd8a991a1d2c5288b735a440a..f3be62e12a535520f69fb2eedcc30c4ce7fcfe39 100644 (file)
--- a/jenkins/packer-images/jenkins-image-k8s-tests.json
+++ b/jenkins/packer-images/jenkins-image-k8s-tests.json
@@ -10,7 +10,7 @@
       "source_image": "debian-10-buster-v20200714",
       "zone": "us-central1-b",
       "disk_size": "10",
-      "image_name": "run-k8s-tests-jenkins-image-{{isotime \"20060102150405\"}}",
+      "image_name": "jenkins-image-k8s-tests{{isotime \"20060102150405\"}}",
       "image_family": "jenkins",
       "image_licenses": ["projects/vm-options/global/licenses/enable-vmx"],
       "ssh_username": "jenkins"