refactoring: rename packer templates and the resulting images to make it

more clear what they are for.

No issue #

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

diff --git a/jenkins/packer-images/jenkins-image-tests.json b/jenkins/packer-images/jenkins-image-arvados-tests.json
similarity index 83%
rename from jenkins/packer-images/jenkins-image-tests.json
rename to jenkins/packer-images/jenkins-image-arvados-tests.json
index 23567260b5ec22f97a156e3ee59d02d8fffbbe93..5fb99122b30620c66e3ecdf114202953aa184cca 100644 (file)
--- a/jenkins/packer-images/jenkins-image-tests.json
+++ b/jenkins/packer-images/jenkins-image-arvados-tests.json
@@ -10,7 +10,7 @@
       "source_image": "debian-10-buster-v20200413",
       "zone": "us-central1-b",
       "disk_size": "10",
-      "image_name": "run-tests-jenkins-image-{{isotime \"20060102150405\"}}",
+      "image_name": "jenkins-image-arvados-tests-{{isotime \"20060102150405\"}}",
       "image_family": "jenkins",
       "ssh_username": "jenkins"
     }
@@ -27,7 +27,7 @@
     },
     {
       "type": "shell",
-      "script": "./jenkins-image-tests.sh"
+      "script": "./jenkins-image-arvados-tests.sh"
     }
   ]
 }

diff --git a/jenkins/packer-images/jenkins-image-tests.sh b/jenkins/packer-images/jenkins-image-arvados-tests.sh
similarity index 100%
rename from jenkins/packer-images/jenkins-image-tests.sh
rename to jenkins/packer-images/jenkins-image-arvados-tests.sh

diff --git a/jenkins/packer-images/jenkins-image-build-packages.json b/jenkins/packer-images/jenkins-image-with-docker.json
similarity index 82%
rename from jenkins/packer-images/jenkins-image-build-packages.json
rename to jenkins/packer-images/jenkins-image-with-docker.json
index b14d2859b349df3d1954565f317d90198618f3ea..5ae1e1ef83c95b14978e989ec09f452802672fbb 100644 (file)
--- a/jenkins/packer-images/jenkins-image-build-packages.json
+++ b/jenkins/packer-images/jenkins-image-with-docker.json
@@ -10,7 +10,7 @@
       "source_image": "debian-10-buster-v20200413",
       "zone": "us-central1-b",
       "disk_size": "20",
-      "image_name": "build-packages-jenkins-image-{{isotime \"20060102150405\"}}",
+      "image_name": "jenkins-image-with-docker-{{isotime \"20060102150405\"}}",
       "image_family": "jenkins",
       "ssh_username": "jenkins"
     }
@@ -27,7 +27,7 @@
     },
     {
       "type": "shell",
-      "script": "./jenkins-image-build-packages.sh"
+      "script": "./jenkins-image-with-docker.sh"
     }
   ]
 }

diff --git a/jenkins/packer-images/jenkins-image-build-packages.sh b/jenkins/packer-images/jenkins-image-with-docker.sh
similarity index 100%
rename from jenkins/packer-images/jenkins-image-build-packages.sh
rename to jenkins/packer-images/jenkins-image-with-docker.sh