Merge branch 'master' into fix/check_ssh-variable-stuff

4 files changed, 100 insertions, 9 deletions

diff --git a/.github/mock.sh b/.github/mock.sh
index 7fbe690..87543ce 100755
--- a/.github/mock.sh
+++ b/.github/mock.sh
@@ -2,6 +2,8 @@
 
 set -x
 
+set -euo pipefail
+
 export DEBIAN_FRONTEND=noninteractive
 
 BASE_PATH="/src"
@@ -18,7 +20,11 @@ SPEC_FILE="${SPEC_DIR}monitoring-plugins.spec"
 cd ${BASE_PATH}
 
 dnf -y --setopt="tsflags=nodocs" update && \
-  if [ ${distro_id} != "fedora" ]; then dnf -y --setopt="tsflags=nodocs" install epel-release; else platform_id="$(echo ${platform_id} | sed s/^f/fc/)"; fi && \
+  if [ "${distro_id}" != "fedora" ]; then
+     dnf -y --setopt="tsflags=nodocs" install epel-release;
+  else
+    platform_id="$(echo "${platform_id}" | sed s/^f/fc/)";
+  fi && \
   case ${distro_id} in
     ol)
       case ${platform_id} in
@@ -32,19 +38,27 @@ dnf -y --setopt="tsflags=nodocs" update && \
       ;;
   esac
   dnf -y --setopt="tsflags=nodocs" install mock rpm-build git-core && \
-  usermod -a -G mock $(whoami)
+  usermod -a -G mock "$(whoami)"
+
 SRC_RPM="monitoring-plugins-*-1.${platform_id}.src.rpm"
+
 if command -v git > /dev/null 2>&1; then
   git config --global --add safe.directory ${BASE_PATH}
   SHA="$(git rev-parse HEAD)"
   sed "s/^%global commit.*/%global commit ${SHA}/" ${SPEC_FILE} > ${SPEC_DIR}monitoring-plugins-git.spec
   sed -i "s/^%global fromgit.*/%global fromgit 1/" ${SPEC_DIR}monitoring-plugins-git.spec
   SPEC_FILE="${SPEC_DIR}monitoring-plugins-git.spec"
-  SRC_RPM="monitoring-plugins-*git.$(echo ${SHA:0:7})*.${platform_id}.src.rpm"
+  SRC_RPM="monitoring-plugins-*git.${SHA:0:7}*.${platform_id}.src.rpm"
 fi
+
 mkdir -p "${SRCRPM_DIR}" "${RPM_DIR}"
 #rpmbuild --undefine=_disable_source_fetch --define "_sourcedir ${SOURCE_DIR}" -ba ${SPEC_FILE}
-dnf -y --setopt="tsflags=nodocs" install rpmdevtools && spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \
-mock --dnf --clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; }
-mock --dnf --clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild ${SRCRPM_DIR}/${SRC_RPM} || { cat ${RPM_DIR}/{root,build}.log; exit 1; }
+dnf -y --setopt="tsflags=nodocs" install rpmdevtools && \
+  spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \
+  { mock --dnf --clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || \
+  { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; } }
+
+mock --dnf --clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild "${SRCRPM_DIR}"/${SRC_RPM} || \
+  { cat ${RPM_DIR}/{root,build}.log; exit 1; }
+
 ls -la ${SOURCE_DIR} ${SRCRPM_DIR} ${RPM_DIR}
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 3f4674a..3640e50 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -x
-set -e
+set -euo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -127,5 +127,5 @@ sed "/NP_HOST_TLS_CERT/s/.*/'NP_HOST_TLS_CERT' => '$(hostname)',/" -i /src/.gith
 
 # create some test files to lower inodes
 for i in $(seq 10); do
-    touch /media/ramdisk2/test.$1
+    touch /media/ramdisk2/test.$i
 done
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml
new file mode 100644
index 0000000..8124075
--- /dev/null
+++ b/.github/workflows/test-next.yml
@@ -0,0 +1,78 @@
+---
+name: Tests Debian:Testing and Fedora:Rawhide
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches-ignore:
+      - '*'
+  schedule:
+    # Run every week on Monday at 9:00 AM (UTC)
+    - cron: '0 9 * * 1'
+
+jobs:
+  full-test:
+    name: Running unit and integrationt tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:
+          - 'debian:testing'
+        include:
+          - distro: 'debian:testing'
+            prepare: .github/prepare_debian.sh
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - name: Run the tests on ${{ matrix.distro }}
+        run: |
+          docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
+          docker run \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.prepare }} && \
+                tools/setup && \
+                ./configure --enable-libtap  --with-ipv6=no && \
+                make && \
+                make test && \
+                make dist && \
+                tar zxf monitoring-plugins-*.tar.gz && \
+                cd monitoring-plugins-*/ && \
+                ./configure && \
+                make'
+          docker container prune -f
+          docker volume prune -f
+
+  build-test:
+    name: Running rpm build test on ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - name: Run the tests on ${{ matrix.distro }}
+        run: |
+          docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
+          docker run \
+              --privileged=true \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.build }} && \
+                ls -la'
+          docker container prune -f
+          docker volume prune -f
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33220d6..77ca658 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,7 +54,6 @@ jobs:
       matrix:
         include:
           - {"distro": "fedora:latest", "build": ".github/mock.sh"}
-          - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
           - {"distro": "rockylinux:8", "build": ".github/mock.sh"}
           - {"distro": "almalinux:9", "build": ".github/mock.sh"}
 #          - {"distro": "oraclelinux:9", "build": ".github/mock.sh"}