From 9ceaa09957cf98cdee27699349482bd954f39d2a Mon Sep 17 00:00:00 2001 From: Stanislav Zidek Date: Mon, 8 Aug 2022 23:07:21 +0200 Subject: Moved TLS interoperability tests to submodule. Signed-off-by: Stanislav Zidek --- .gitlab-ci.yml | 5 ++--- .gitmodules | 3 +++ bootstrap.conf | 2 +- tests/suite/tls-interoperability | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 160000 tests/suite/tls-interoperability diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bca9a3230f..fd8954b84f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: CHECKJOBS: 16 cache: - key: "$CI_JOB_NAME-ver25" + key: "$CI_JOB_NAME-ver26" paths: - cache/ @@ -391,8 +391,7 @@ fedora-interop/test: #- rsapss allow_failure: true script: - - git clone --depth=1 https://gitlab.com/redhat-crypto/tests/interop.git - - cd interop/ + - cd tests/suite/tls-interoperability/ - echo "Tests to run:" - tmt run plans -n interop tests -f "tag:interop-gnutls" -f "tag:interop-$TYPE" -f "tag:interop-$COMPONENT" discover -v - echo "Run the tests:" diff --git a/.gitmodules b/.gitmodules index 2400cfb628..ff0b12fa73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "devel/cligen"] path = cligen url = https://gitlab.com/gnutls/cligen.git +[submodule "tests/suite/tls-interoperability"] + path = tests/suite/tls-interoperability + url = https://gitlab.com/redhat-crypto/tests/interop.git diff --git a/bootstrap.conf b/bootstrap.conf index 9f6ffd8880..ca7c0123b4 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -23,7 +23,7 @@ gnulib_tool_option_extras="--without-tests --avoid=alignof-tests --avoid=lock-te use_libtool=1 checkout_only_file= local_gl_dir=gl/override/ -required_submodules="tests/suite/tls-fuzzer/python-ecdsa tests/suite/tls-fuzzer/tlsfuzzer tests/suite/tls-fuzzer/tlslite-ng cligen devel/abi-dump devel/nettle devel/openssl devel/libtasn1" +required_submodules="tests/suite/tls-fuzzer/python-ecdsa tests/suite/tls-fuzzer/tlsfuzzer tests/suite/tls-fuzzer/tlslite-ng tests/suite/tls-interoperability cligen devel/abi-dump devel/nettle devel/openssl devel/libtasn1" # Those modules are common to lib/ and src/. common_modules=" diff --git a/tests/suite/tls-interoperability b/tests/suite/tls-interoperability new file mode 160000 index 0000000000..fd76ba1868 --- /dev/null +++ b/tests/suite/tls-interoperability @@ -0,0 +1 @@ +Subproject commit fd76ba18687e684f656bb3cf7a37fcb93b4e1f0f -- cgit v1.2.1