Make Packer docker_repo vary by OS

We have DockerHub repos opendaylight/odl for CentOS (main OS) and
opendaylight/fedora for Fedora. With the docker_repo var in ODL var
file, it required a manual `docker tag` to push Fedora images to the
right repo. Making it vary by OS is more correct, avoids this step.

Change-Id: Ibcdfa2d509427652ac6096104e883316c2c54905
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/packer/vars/centos-7.3.1611.json b/packer/vars/centos-7.3.1611.json
index 03f18802a354674fa5fee93d577be6b3ce7f5081..28a122dfa1673c681cd3c5bd9c053fd7f3e1b2fd 100644 (file)
--- a/packer/vars/centos-7.3.1611.json
+++ b/packer/vars/centos-7.3.1611.json
@@ -3,5 +3,6 @@
     "os_version": "7.3.1611",
     "guest_os_type": "RedHat_64",
     "iso_urls": "http://mirrors.rit.edu/centos/7.3.1611/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso",
-    "iso_checksum": "27bd866242ee058b7a5754e83d8ee8403e216b93d130d800852a96f41c34d86a"
+    "iso_checksum": "27bd866242ee058b7a5754e83d8ee8403e216b93d130d800852a96f41c34d86a",
+    "docker_repo": "opendaylight/odl"
 }

diff --git a/packer/vars/fedora-26.json b/packer/vars/fedora-26.json
index 9a345c102a0eae01afce020ebea3baa8b88e1251..400a58e4e15deba0f1551b4a6ffcf098abead908 100644 (file)
--- a/packer/vars/fedora-26.json
+++ b/packer/vars/fedora-26.json
@@ -3,5 +3,6 @@
     "os_version": "26",
     "guest_os_type": "Fedora_64",
     "iso_urls": "http://mirror.math.princeton.edu/pub/fedora/linux/releases/26/Server/x86_64/iso/Fedora-Server-dvd-x86_64-26-1.5.iso",
-    "iso_checksum": "fad18a43b9cec152fc8a1fd368950eaf59be66b1a15438149a0c3a509c56cf2f"
+    "iso_checksum": "fad18a43b9cec152fc8a1fd368950eaf59be66b1a15438149a0c3a509c56cf2f",
+    "docker_repo": "opendaylight/fedora"
 }

diff --git a/packer/vars/opendaylight-3.4.0.json b/packer/vars/opendaylight-3.4.0.json
index 9e6bbf9fed6254e0fd52c9217d56021420b8262d..9eee5fec8281688e8b3adf907e8f620f3792c6d1 100644 (file)
--- a/packer/vars/opendaylight-3.4.0.json
+++ b/packer/vars/opendaylight-3.4.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "3.4.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-34-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.0.0.json b/packer/vars/opendaylight-4.0.0.json
index 82044573e3d54ad07a3d1d22b4e69e4cb4d700af..b656107ba7ee3f502aff04c47a80f7d7b279c412 100644 (file)
--- a/packer/vars/opendaylight-4.0.0.json
+++ b/packer/vars/opendaylight-4.0.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "4.0.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-40-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.1.0.json b/packer/vars/opendaylight-4.1.0.json
index 9ebdaf7b305617887b9bbd86c64b8f06cf23034f..b74842213200bccb2788a3c618c6c35168d6caf3 100644 (file)
--- a/packer/vars/opendaylight-4.1.0.json
+++ b/packer/vars/opendaylight-4.1.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "4.1.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-41-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.2.0.json b/packer/vars/opendaylight-4.2.0.json
index 2882776d69c98044b5f31a803452c5c96724ab78..4022ff8bff6d4f17bfd379f53608e6a43d2fdaab 100644 (file)
--- a/packer/vars/opendaylight-4.2.0.json
+++ b/packer/vars/opendaylight-4.2.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "4.2.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-42-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.3.0.json b/packer/vars/opendaylight-4.3.0.json
index 7fffb1d5a56065b9f2134471be51411dec136019..1dc29137c1b8a33b3781bb52521a5a3c94f48dd4 100644 (file)
--- a/packer/vars/opendaylight-4.3.0.json
+++ b/packer/vars/opendaylight-4.3.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "4.3.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-43-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.4.0.json b/packer/vars/opendaylight-4.4.0.json
index 52bbb3109fc43755ae81faf09867500711b65149..06254dc70bc04146b766173040ad2824efebb4c4 100644 (file)
--- a/packer/vars/opendaylight-4.4.0.json
+++ b/packer/vars/opendaylight-4.4.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "4.4.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-44-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.0.0.json b/packer/vars/opendaylight-5.0.0.json
index 2c57dcbf17378b0073e3ffae1aa814b94f1c8ee2..98a84bd1d7fb2928fbe81b8c80aafeb56a660d93 100644 (file)
--- a/packer/vars/opendaylight-5.0.0.json
+++ b/packer/vars/opendaylight-5.0.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "5.0.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-50-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.1.0.json b/packer/vars/opendaylight-5.1.0.json
index 03466abf00293fae3d45400d9027cc43249178e2..c5f749eba9b57e83bd7240ad742022be666caa26 100644 (file)
--- a/packer/vars/opendaylight-5.1.0.json
+++ b/packer/vars/opendaylight-5.1.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "5.1.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-51-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.2.0.json b/packer/vars/opendaylight-5.2.0.json
index 2b7fdc6419f948822dc3393152376f3456975623..1146e82be784eb60424ae8ce4a5cf2213edd5a0b 100644 (file)
--- a/packer/vars/opendaylight-5.2.0.json
+++ b/packer/vars/opendaylight-5.2.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "5.2.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-52-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.3.0.json b/packer/vars/opendaylight-5.3.0.json
index e60275fb3225903cb98d53591d654f7d660bdd36..ebb521f03955ec12ec5c312527f9408a5b0d95c3 100644 (file)
--- a/packer/vars/opendaylight-5.3.0.json
+++ b/packer/vars/opendaylight-5.3.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "5.3.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-53-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.4.0.json b/packer/vars/opendaylight-5.4.0.json
index 82c688ae6f26d0ef2473f752910e9312c6b5a900..557a91612a7007dd67d0c76b89834991866efa9b 100644 (file)
--- a/packer/vars/opendaylight-5.4.0.json
+++ b/packer/vars/opendaylight-5.4.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "5.4.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-54-release.repo'"
 }

diff --git a/packer/vars/opendaylight-6.0.0.json b/packer/vars/opendaylight-6.0.0.json
index 69c22934d177f743a185b92aee78c44f459d97a2..5c8203b6427ec7e6e15564d8b1d0002ba30c04e5 100644 (file)
--- a/packer/vars/opendaylight-6.0.0.json
+++ b/packer/vars/opendaylight-6.0.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "6.0.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-60-release.repo'"
 }

diff --git a/packer/vars/opendaylight-6.1.0.json b/packer/vars/opendaylight-6.1.0.json
index 1d7b7546b38838f32017560fc5e8a4c4cd9eb497..d231f063abb64194d08f3636ae6a6c6acfb7f702 100644 (file)
--- a/packer/vars/opendaylight-6.1.0.json
+++ b/packer/vars/opendaylight-6.1.0.json
@@ -1,5 +1,4 @@
 {
     "odl_version": "6.1.0",
-    "docker_repo": "opendaylight/odl",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-61-release.repo'"
 }