[lxc-devel] [lxd/master] tests: Drop jenkins-specific check again

stgraber on Github lxc-bot at linuxcontainers.org
Wed May 10 21:05:33 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170510/4cbdb3ab/attachment.bin>
-------------- next part --------------
From e2de098f1719cc336b41a39444968406110ed060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 10 May 2017 17:05:11 -0400
Subject: [PATCH] tests: Drop jenkins-specific check again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 test/main.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/main.sh b/test/main.sh
index 5728cb7..d73597d 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -83,14 +83,7 @@ storage_backend() {
 
 
 if [ -z "${LXD_BACKEND:-}" ]; then
-    # XXX The Jenkins lxd-github-pull-test job sets "backend" as environment
-    #     variable as opposed to LXD_BACKEND, so we want to honor that. This
-    #     should probably be fixed in the Jenkins configuration.
-    if [ -n "${JENKINS_URL:-}" ] && [ -n "${backend:-}" ]; then
-      LXD_BACKEND="${backend}"
-    else
-      LXD_BACKEND=dir
-    fi
+  LXD_BACKEND=dir
 fi
 
 echo "==> Available storage backends: $(available_storage_backends | sort)"


More information about the lxc-devel mailing list