Use Lustre 2.12.1 from download site when available (whamcloud#902)

Fixes #894. Signed-off-by: Joe Grund <jgrund@whamcloud.io>
AlexTalker · May 1, 2019 · 3cfe118 · 3cfe118
1 parent 419ba45
commit 3cfe118
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lustre-client.repo b/lustre-client.repo
@@ -1,6 +1,6 @@
 [lustre-client]
 name=Lustre Client
-baseurl=https://build.whamcloud.com/jobs-pub/lustre-b2_12/configurations/axis-arch/x86_64/axis-build_type/client/axis-distro/el7.6/axis-ib_stack/inkernel/lastStable/archive/artifacts/
+baseurl=https://downloads.whamcloud.com/public/lustre/lustre-2.12.1/el7/client/
 enabled=1
 gpgcheck=0
 repo_gpgcheck=0
diff --git a/lustre-server.repo b/lustre-server.repo
@@ -1,6 +1,6 @@
 [lustre]
 name=Lustre Server
-baseurl=https://build.whamcloud.com/jobs-pub/lustre-b2_12/configurations/axis-arch/x86_64/axis-build_type/server/axis-distro/el7.6/axis-ib_stack/inkernel/lastStable/archive/artifacts/
+baseurl=https://downloads.whamcloud.com/public/lustre/lustre-2.12.1/el7/server/
 enabled=1
 gpgcheck=0
 repo_gpgcheck=0

diff --git a/tests/framework/utils/defaults.sh.in b/tests/framework/utils/defaults.sh.in
@@ -110,14 +110,14 @@ set_defaults() {
     export COPR_PROJECT="@MFL_REPO_NAME@"
 
     # to build a job from a jenkins branch
-    JENKINS_JOB=lustre-b2_12
+    #JENKINS_JOB=lustre-b2_12
     #JENKINS_BUILD=111
     # or to just build the latest from that branch
-    JENKINS_BUILD=lastSuccessfulBuild
+    #JENKINS_BUILD=lastSuccessfulBuild
     # or to build a Lustre Review job:
     # LUSTRE_REVIEW_BUILD="63547"
     # or build a GA release
-    # LUSTRE_VERSION=2.10.7
+    LUSTRE_VERSION=2.12.1
 
     if [ -n "$LUSTRE_REVIEW_BUILD" ]; then
         JENKINS_JOB="lustre-reviews"
@@ -127,7 +127,7 @@ set_defaults() {
         BASE_URL="https://build.whamcloud.com/jobs-pub/$JENKINS_JOB/configurations/axis-arch/\\\$basearch/axis-build_type/@CLIENT_OR_SERVER@/axis-distro/el7.6/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.whamcloud.com/public/lustre/lustre-$LUSTRE_VERSION/el7.6/@CLIENT_OR_SERVER@"
+        BASE_URL="https://downloads.whamcloud.com/public/lustre/lustre-$LUSTRE_VERSION/el7/@CLIENT_OR_SERVER@"
     else
         echo "I don't know which Lustre you want to use.  Bailing."
         exit 1