From 1f7683cf9ca7134a000c6bb7c2b5ba933b03d913 Mon Sep 17 00:00:00 2001
From: "Brian J. Murrell" <brian@interlinx.bc.ca>
Date: Tue, 22 May 2018 17:06:22 -0400
Subject: [PATCH] CentOS 7.5 and Lustre 2.10.4 (#603)

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
---
 chroma-bundles/install                        |  2 +-
 chroma-manager/storage_server.repo            |  4 +--
 .../tests/framework/utils/defaults.sh         | 34 ++++++++++++++-----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/chroma-bundles/install b/chroma-bundles/install
index 38762271c7..49c3199dfa 100755
--- a/chroma-bundles/install
+++ b/chroma-bundles/install
@@ -72,7 +72,7 @@ def _check_platform():
     SUPPORTED_DISTROS = ['redhat', 'centos']
     # Keep the version locked down for now -- if we can go with a minimum
     # version that'd be better, but we can't assume (c.f. pacemaker).
-    SUPPORTED_VERSIONS = ['7.1', '7.1.1503', '7.2', '7.2.1511', '7.3', '7.3.1611', '7.4', '7.4.1708', '7.5']
+    SUPPORTED_VERSIONS = ['7.1', '7.1.1503', '7.2', '7.2.1511', '7.3', '7.3.1611', '7.4', '7.4.1708', '7.5', '7.5.1804']
     # This will work assuming we have version parity across all supported
     # distributions.
     SUPPORTED_PLATFORMS = ["%s-%s-%s" % p for p in itertools.product(SUPPORTED_DISTROS, SUPPORTED_VERSIONS, SUPPORTED_ARCHES)]
diff --git a/chroma-manager/storage_server.repo b/chroma-manager/storage_server.repo
index 90df814214..790f4392dc 100644
--- a/chroma-manager/storage_server.repo
+++ b/chroma-manager/storage_server.repo
@@ -11,13 +11,13 @@ enabled_metadata=1
 
 [lustre]
 name=Lustre Server
-baseurl=https://downloads.hpdd.intel.com/public/lustre/lustre-2.10.3/el7/server/
+baseurl=https://downloads.hpdd.intel.com/public/lustre/lustre-2.10.4/el7/server/
 enabled=1
 gpgcheck=0
 
 [lustre-client]
 name=Lustre Client
-baseurl=https://downloads.hpdd.intel.com/public/lustre/lustre-2.10.3/el7/client/
+baseurl=https://downloads.hpdd.intel.com/public/lustre/lustre-2.10.4/el7/client/
 enabled=1
 gpgcheck=0
 
diff --git a/chroma-manager/tests/framework/utils/defaults.sh b/chroma-manager/tests/framework/utils/defaults.sh
index f8101ab3b5..d0249b9805 100644
--- a/chroma-manager/tests/framework/utils/defaults.sh
+++ b/chroma-manager/tests/framework/utils/defaults.sh
@@ -21,9 +21,9 @@ set_distro_vars() {
             else
                 export TEST_DISTRO_VERSION=${TEST_DISTRO_VERSION:-"7.4"}
             fi
-            export UPGRADE_DISTRO_VERSION=${UPGRADE_DISTRO_VERSION:-"7.4"}
+            export UPGRADE_DISTRO_VERSION=${UPGRADE_DISTRO_VERSION:-"7.5"}
         else
-            export TEST_DISTRO_VERSION=${TEST_DISTRO_VERSION:-"7.4"}
+            export TEST_DISTRO_VERSION=${TEST_DISTRO_VERSION:-"7.5"}
         fi
     else
        if ${upgrade_test}; then
@@ -111,16 +111,32 @@ set_defaults() {
 
     export COPR_OWNER="managerforlustre"
     export COPR_PROJECT="manager-for-lustre"
-    #LUSTRE_REVIEW_BUILD="12345"
+
+    # to build a job from a jenkins branch
+    #JENKINS_JOB=lustre-b2_10
+    #JENKINS_BUILD=111
+    # or to just build the latest from that branch
+    #JENKINS_BUILD=lastSuccessfulBuild
+    # or to build a Lustre Review job:
+    #LUSTRE_REVIEW_BUILD="56451"
+    # or build a GA release
+    LUSTRE_VERSION=2.10.4
+
     if [ -n "$LUSTRE_REVIEW_BUILD" ]; then
-        BASE_URL="https://build.whamcloud.com/jobs-pub/lustre-reviews/configurations/axis-arch/\\\$basearch/axis-build_type"
-        export LUSTRE_SERVER_URL="$BASE_URL/server/axis-distro/el7/axis-ib_stack/inkernel/builds/$LUSTRE_REVIEW_BUILD/archive/artifacts/"
-        export LUSTRE_CLIENT_URL="$BASE_URL/client/axis-distro/el7/axis-ib_stack/inkernel/builds/$LUSTRE_REVIEW_BUILD/archive/artifacts/"
+        JENKINS_JOB="lustre-reviews"
+        JENKINS_BUILD="$LUSTRE_REVIEW_BUILD"
+    fi
+    if [ -n "$JENKINS_JOB" ]; then
+        BASE_URL="https://build.whamcloud.com/jobs-pub/$JENKINS_JOB/configurations/axis-arch/\\\$basearch/axis-build_type/@CLIENT_OR_SERVER@/axis-distro/el7/axis-ib_stack/inkernel/builds/$JENKINS_BUILD/archive/artifacts/"
+    elif [ -n "$LUSTRE_VERSION" ]; then
+        # To use a GA release of Lustre:
+        BASE_URL="https://downloads.hpdd.intel.com/public/lustre/lustre-$LUSTRE_VERSION/el7/@CLIENT_OR_SERVER@"
     else
-        BASE_URL="https://downloads.hpdd.intel.com/public/lustre/lustre-2.10.3/el7/"
-        export LUSTRE_SERVER_URL="$BASE_URL/server/"
-        export LUSTRE_CLIENT_URL="$BASE_URL/client/"
+        echo "I don't know which Lustre you want to use.  Bailing."
+        exit 1
     fi
+    export LUSTRE_SERVER_URL="${BASE_URL//@CLIENT_OR_SERVER@/server}"
+    export LUSTRE_CLIENT_URL="${BASE_URL//@CLIENT_OR_SERVER@/client}"
     LUSTRE_SERVER_REPO_FILE="/etc/yum.repos.d/$(echo "$LUSTRE_SERVER_URL" | sed -e 's/^.*:\/\///' -e 's/\/\/*/_/g').repo"
     LUSTRE_CLIENT_REPO_FILE="/etc/yum.repos.d/$(echo "$LUSTRE_CLIENT_URL" | sed -e 's/^.*:\/\///' -e 's/\/\/*/_/g').repo"
     export LUSTRE_SERVER_REPO_FILE LUSTRE_CLIENT_REPO_FILE