Add ODL 4.0.0-20151215033 RPM build definition

Makes minor tweaks to the build logic to add support for building
"Experimental Release Preview" RPMs for pre-release testing.

Adds the build configuration required for building from a pre-release
candidate build of OpenDaylight Beryllium.

This is meant for consumption by OPNFV's testing projects.

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

diff --git a/rpm/build_vars.yaml b/rpm/build_vars.yaml
index 18ea5e727c55658c469aaabdfaac48bcaa58192c..38de041fa13b6f5138db6f970cf656e2ae2de596 100644 (file)
--- a/rpm/build_vars.yaml
+++ b/rpm/build_vars.yaml
@@ -31,6 +31,7 @@ builds:
     java_version: "= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
     codename: Helium-SR4
+    download_url: "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
     changelog: |
       * Tue Sep 15 2015 Daniel Farrell <dfarrell@redhat.com> - 2.4.0-1
       - Create Helium SR4 RPM
@@ -42,6 +43,7 @@ builds:
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
     codename: Lithium
+    download_url: "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.0-Lithium/distribution-karaf-0.3.0-Lithium.tar.gz"
     changelog: |
       * Fri Jul 17 2015 Daniel Farrell <dfarrell@redhat.com> - 3.0.0-2
       - Include required disttag in RPM release version
@@ -53,6 +55,7 @@ builds:
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
     codename: Lithium-SR1
+    download_url: "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.1-Lithium-SR1/distribution-karaf-0.3.1-Lithium-SR1.tar.gz"
     changelog: |
       * Tue Sep 15 2015 Daniel Farrell <dfarrell@redhat.com> - 3.1.0-1
       - Create Lithium SR1 RPM
@@ -64,6 +67,7 @@ builds:
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
     codename: Lithium-SR2
+    download_url: "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
     changelog: |
       * Mon Oct 26 2015 Daniel Farrell <dfarrell@redhat.com> - 3.2.0-1
       - Create Lithium SR2 RPM
@@ -75,6 +79,19 @@ builds:
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
     codename: Lithium-SR3
+    download_url: "https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
     changelog: |
       * Fri Dec 11 2015 Daniel Farrell <dfarrell@redhat.com> - 3.3.0-1
       - Create Lithium SR3 RPM
+  - version_major: 4
+    version_minor: 0
+    version_patch: 0
+    rpm_release: 1.201512150335
+    rpm_disttag: el7
+    java_version: ">= 1:1.7.0"
+    sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
+    codename: Test-beryllium-v201512150335
+    download_url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Test-beryllium-v201512150335/distribution-karaf-0.4.0-Test-beryllium-v201512150335.tar.gz"
+    changelog: |
+      * Tue Dec 15 2015 Daniel Farrell <dfarrell@redhat.com> - 4.0.0-1.201512150335
+      - Create Beryllium Experimental Release Preview RPM

diff --git a/rpm/cache/cache.py b/rpm/cache/cache.py
index e85b8f67a110cf70f2b5bbbb04088ee94d53b1a3..52b0a26c04c9028b8c832f3f444c8af90516ad37 100755 (executable)
--- a/rpm/cache/cache.py
+++ b/rpm/cache/cache.py
@@ -42,7 +42,6 @@ def cache_build(build):
     """
     # Specialize a series of name/URL templates for the given build
     odl_tarball = odl_template.substitute(build)
-    odl_tarball_url = odl_url_template.substitute(build)
     unitfile = unitfile_template.substitute(build)
     unitfile_url = unitfile_url_template.substitute(build)
     unitfile_tarball = unitfile_tb_template.substitute(build)
@@ -54,8 +53,8 @@ def cache_build(build):
 
     # Cache appropriate version of OpenDaylight's release tarball
     if not os.path.isfile(odl_tarball_path):
-        print("Downloading: {}".format(odl_tarball_url))
-        urllib.urlretrieve(odl_tarball_url, odl_tarball_path)
+        print("Downloading: {}".format(build["download_url"]))
+        urllib.urlretrieve(build["download_url"], odl_tarball_path)
         print("Cached: {}".format(odl_tarball))
     else:
         print("Already cached: {}".format(odl_tarball))

diff --git a/rpm/example_repo_configs/opendaylight-4-testing.repo b/rpm/example_repo_configs/opendaylight-4-testing.repo
new file mode 100644 (file)
index 0000000..a6cfeda
--- /dev/null
+++ b/rpm/example_repo_configs/opendaylight-4-testing.repo
@@ -0,0 +1,5 @@
+[opendaylight-4-testing]
+name=CentOS CBS OpenDaylight Beryllium testing repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/
+enabled=1
+gpgcheck=0