From: Daniel Farrell <dfarrell@redhat.com>
Date: Thu, 10 Aug 2017 13:08:56 +0000 (-0400)
Subject: Make Packer docker_repo vary by OS
X-Git-Tag: release/nitrogen~35
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F61495%2F3;p=integration%2Fpackaging.git

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 03f1880..28a122d 100644
--- 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 9a345c1..400a58e 100644
--- 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 9e6bbf9..9eee5fe 100644
--- 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 8204457..b656107 100644
--- 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 9ebdaf7..b748422 100644
--- 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 2882776..4022ff8 100644
--- 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 7fffb1d..1dc2913 100644
--- 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 52bbb31..06254dc 100644
--- 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 2c57dcb..98a84bd 100644
--- 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 03466ab..c5f749e 100644
--- 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 2b7fdc6..1146e82 100644
--- 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 e60275f..ebb521f 100644
--- 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 82c688a..557a916 100644
--- 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 69c2293..5c8203b 100644
--- 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 1d7b754..d231f06 100644
--- 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'"
 }