the rpki-client external test should use relase version not a master branch on github

@botovq asked me not to use master branch of rpki-client. This will keep CI-run
green regardless of what happens in rpki-client active development branch.
Once new version of rpki-client will be released we will just update the
test here to fetch new msater version.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28136)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c53ce8ab38eab2ffe9d0473af1b4d2faa43931a..8a9e4dc5e50186d0bd8f896a03be5cb64300366e 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -628,7 +628,7 @@ jobs:
     - name: package installs
       run: |
         sudo apt-get update
-        sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy gdb libtls-dev
+        sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy gdb libtls-dev wget
     - name: install cpanm and Test2::V0 for gost_engine testing
       uses: perl-actions/install-with-cpanm@10d60f00b4073f484fc29d45bfbe2f776397ab3d # v1.7
       with:

diff --git a/.gitmodules b/.gitmodules
index e5b8ed316b8049386bfba61b6382c05f6977e131..b4c756a67b1796613312e4b547dfabd53e5eb2c6 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,6 +35,3 @@
 [submodule "pkcs11-provider"]
        path = pkcs11-provider
        url = https://github.com/latchset/pkcs11-provider.git
-[submodule "rpki-client-portable"]
-       path = rpki-client-portable
-       url = https://github.com/rpki-client/rpki-client-portable

diff --git a/rpki-client-portable b/rpki-client-portable
deleted file mode 160000 (submodule)
index 4fe1d9b..0000000
--- a/rpki-client-portable
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4fe1d9b72dfd6b8745b8a3d66b388526835998be

diff --git a/test/recipes/95-test_external_rpki-client-portable.t b/test/recipes/95-test_external_rpki-client-portable.t
index 5b6b8de529ba4fd19c71a8b4f651ab388f709ee8..19652e6501e76dfc0ed761cfd0421914c68e4e7a 100644 (file)
--- a/test/recipes/95-test_external_rpki-client-portable.t
+++ b/test/recipes/95-test_external_rpki-client-portable.t
@@ -16,14 +16,19 @@ setup("test_external_rpki-client-portable");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");
-plan skip_all => "rpki-client-portable not available"
-    if ! -f srctop_file("rpki-client-portable", "configure.ac");
 
 plan tests => 1;
 
+$RPKI_VERSION = "9.5";
+$RPKI_SRC = "rpki-client-".$RPKI_VERSION;
+$RPKI_SUFFIX = ".tar.gz";
+$RPKI_TARBALL = $RPKI_SRC.$RPKI_SUFFIX;
+$RPKI_BASE_URL = "https://cdn.openbsd.org/pub/OpenBSD/rpki-client/";
+
 $ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("providers"));
 $ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "default-and-legacy.cnf"));
-$ENV{ AUTOCONF_VERSION} = 2.72;
-$ENV{ AUTOMAKE_VERSION} = 1.16;
+$ENV{RPKI_DOWNLOAD_URL} = $RPKI_BASE_URL.$RPKI_TARBALL;
+$ENV{RPKI_TARBALL} = $RPKI_TARBALL;
+$ENV{RPKI_SRC} = $RPKI_SRC;
 
 ok(run(cmd([data_file("rpki-client-portable.sh")])), "running rpki-client tests");

diff --git a/test/recipes/95-test_external_rpki-client-portable_data/rpki-client-portable.sh b/test/recipes/95-test_external_rpki-client-portable_data/rpki-client-portable.sh
index efd5c501ac7371786f9354c4b41adaa1ec709e48..c86217b18ae7a42f7938e38454e8cac22afafe99 100755 (executable)
--- a/test/recipes/95-test_external_rpki-client-portable_data/rpki-client-portable.sh
+++ b/test/recipes/95-test_external_rpki-client-portable_data/rpki-client-portable.sh
@@ -11,9 +11,8 @@
 LDFLAGS="-L`pwd`/$BLDTOP -Wl,-rpath,`pwd`/$BLDTOP"
 CFLAGS="-I`pwd`/$BLDTOP/include -I`pwd`/$SRCTOP/include"
 
-cd $SRCTOP/rpki-client-portable
-
-./autogen.sh
+wget -O $RPKI_TARBALL $RPKI_DOWNLOAD_URL && tar xzf $RPKI_TARBALL
+cd $RPKI_SRC
 
 ./configure --with-openssl-cflags="$CFLAGS" --with-openssl-ldflags="$LDFLAGS" \
             CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"