[ARVADOS-DEV] updated: 56a0ef48ec261d0cd4ccc13ccc5010a507b2442e

Git user git at public.arvados.org
Fri Jul 31 00:31:17 UTC 2020


Summary of changes:
 .../{jenkins-image-tests.json => jenkins-image-arvados-tests.json}    | 4 ++--
 .../{jenkins-image-tests.sh => jenkins-image-arvados-tests.sh}        | 0
 ...nkins-image-build-packages.json => jenkins-image-with-docker.json} | 4 ++--
 .../{jenkins-image-build-packages.sh => jenkins-image-with-docker.sh} | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename jenkins/packer-images/{jenkins-image-tests.json => jenkins-image-arvados-tests.json} (83%)
 rename jenkins/packer-images/{jenkins-image-tests.sh => jenkins-image-arvados-tests.sh} (100%)
 rename jenkins/packer-images/{jenkins-image-build-packages.json => jenkins-image-with-docker.json} (82%)
 rename jenkins/packer-images/{jenkins-image-build-packages.sh => jenkins-image-with-docker.sh} (100%)

       via  56a0ef48ec261d0cd4ccc13ccc5010a507b2442e (commit)
      from  b3add11716203fea02724a862abb714ba6a99058 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 56a0ef48ec261d0cd4ccc13ccc5010a507b2442e
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Jul 30 20:30:20 2020 -0400

    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 at 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 2356726..5fb9912 100644
--- 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 b14d285..5ae1e1e 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list