[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lxc-devel
Subject:    [lxc-devel] [lxd/master] tests: Fix pki with newer easyrsa
From:       stgraber on Github <lxc-bot () linuxcontainers ! org>
Date:       2018-08-31 18:25:14
Message-ID: 20180831182514.66BA25A80C () mailman01 ! srv ! dcmtl ! stgraber ! net
[Download RAW message or body]

[Attachment #2 (text/x-mailbox)]

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4992

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

[Attachment #3 (text/plain)]

From 51cbd1cc0957e0fef99405c3805ca9caed36ad02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stéphane Graber?= <stgraber@ubuntu.com>
Date: Fri, 31 Aug 2018 11:24:05 -0700
Subject: [PATCH] tests: Fix pki with newer easyrsa
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---
 test/suites/pki.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/suites/pki.sh b/test/suites/pki.sh
index 2824bda443..26f52e1974 100644
--- a/test/suites/pki.sh
+++ b/test/suites/pki.sh
@@ -10,11 +10,22 @@ test_pki() {
     set -e
     cd "${TEST_DIR}/pki"
     # shellcheck disable=SC1091
-    . ./vars
-    ./clean-all
-    ./pkitool --initca
-    ./pkitool --server 127.0.0.1
-    ./pkitool lxd-client
+    if [ -e pkitool ]; then
+        . ./vars
+        ./clean-all
+        ./pkitool --initca
+        ./pkitool --server 127.0.0.1
+        ./pkitool lxd-client
+    else
+        ./easyrsa init-pki
+        echo "lxd" | ./easyrsa build-ca nopass
+        ./easyrsa build-server-full 127.0.0.1 nopass
+        ./easyrsa build-client-full lxd-client nopass
+        mkdir keys
+        cp pki/private/* keys/
+        cp pki/issued/* keys/
+        cp pki/ca.crt keys/
+    fi
   )

   # Setup the daemon

[Attachment #4 (text/plain)]

_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel


[prev in list] [next in list] [prev in thread] [next in thread]