From 644d3c7e13c6a64bf5cb628137ee5bd4dada4b74 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Thu, 24 Feb 2022 09:57:19 +0100
Subject: [PATCH] ci: improve wolfSSL test coverage
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In order to prevent regressions like #9283, lets add build and runtime
testing of wolfSSL master and release branches into daily scheduled
pipeline.

References: https://github.com/openwrt/openwrt/issues/9283
References: https://github.com/wolfSSL/wolfssl/issues/4879
Signed-off-by: Petr Å tetiar <ynezz@true.cz>
---
 .gitlab-ci.yml      | 18 +++++++++++-------
 .gitlab/wolfssl.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 .gitlab/wolfssl.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4e74d7..cae7102 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
 
 include:
   - remote: https://gitlab.com/ynezz/openwrt-ci/raw/master/openwrt-ci/gitlab/main.yml
-
+  - local: .gitlab/wolfssl.yml
 
 .native ustream-ssl backend:
   extends: .openwrt-native-build
@@ -13,13 +13,22 @@ include:
     - git clone https://git.openwrt.org/project/ustream-ssl.git
     - |
       cd ustream-ssl &&
-      git checkout -b testing origin/$CI_COMMIT_BRANCH &&
+      git log -1 &&
       export VERBOSE=1 &&
       mkdir -p build && cd build &&
       cmake .. -DCMAKE_INSTALL_PREFIX=/usr $CI_CMAKE_EXTRA_BUILD_ARGS && cd .. &&
       make -j$(($(nproc)+1)) -C build &&
       sudo make install -C build && cd ..
 
+    - cd $CI_PROJECT_DIR
+    - rm -fr ustream-ssl
+
+various native checks with ustream-ssl/wolfSSL backend (master branch):
+  extends: .ustream-ssl wolfSSL master
+
+various native checks with ustream-ssl/wolfSSL backend (release branch):
+  extends: .ustream-ssl wolfSSL release
+
 various native checks with ustream-ssl/OpenSSL backend:
   extends: .native ustream-ssl backend
 
@@ -28,11 +37,6 @@ various native checks with ustream-ssl/mbedTLS backend:
   variables:
     CI_CMAKE_EXTRA_BUILD_ARGS: -DMBEDTLS=on
 
-various native checks with ustream-ssl/wolfSSL backend:
-  extends: .native ustream-ssl backend
-  variables:
-    CI_CMAKE_EXTRA_BUILD_ARGS: -DWOLFSSL=on
-
 build with Atheros ATH79 SDK (out of tree):
   extends: .openwrt-sdk-oot-build_ath79-generic
 
diff --git a/.gitlab/wolfssl.yml b/.gitlab/wolfssl.yml
new file mode 100644
index 0000000..3e4b6fb
--- /dev/null
+++ b/.gitlab/wolfssl.yml
@@ -0,0 +1,42 @@
+.ustream-ssl wolfSSL:
+  extends: .openwrt-native-build
+  variables:
+    CI_CMAKE_EXTRA_BUILD_ARGS: -DWOLFSSL=on
+
+  before_script:
+    - git clone -b $CI_WOLFSSL_TEST_BRANCH --depth 1 https://github.com/wolfSSL/wolfssl
+    - |
+      cd wolfssl &&
+      git log -1 &&
+      ./autogen.sh &&
+      ./configure \
+          --enable-sni \
+          --enable-opensslall \
+          --enable-opensslextra \
+          --enable-altcertchains \
+          --prefix=/usr &&
+      make -j$(($(nproc)+1)) all &&
+      sudo make install && cd ..
+
+    - git clone https://git.openwrt.org/project/ustream-ssl.git
+    - |
+      cd ustream-ssl &&
+      git log -1 &&
+      export VERBOSE=1 &&
+      mkdir -p build && cd build &&
+      cmake .. -DCMAKE_INSTALL_PREFIX=/usr $CI_CMAKE_EXTRA_BUILD_ARGS && cd .. &&
+      make -j$(($(nproc)+1)) -C build &&
+      sudo make install -C build
+
+    - cd $CI_PROJECT_DIR
+    - rm -fr wolfssl ustream-ssl
+
+.ustream-ssl wolfSSL master:
+  extends: .ustream-ssl wolfSSL
+  variables:
+    CI_WOLFSSL_TEST_BRANCH: master
+
+.ustream-ssl wolfSSL release:
+  extends: .ustream-ssl wolfSSL
+  variables:
+    CI_WOLFSSL_TEST_BRANCH: release
-- 
2.30.2