Merge pull request #15 from sarus-suite/fc-bats-on-runner

Add basic extra test capability.
Fixes CI image to use CMD rather than entrypoint, which facilitates usage.

Author: fcruzcscs

.github/containers/Containerfile.ci

@@ -35,5 +35,5 @@ RUN set -eux; \
 ENV PATH=$PATH:/usr/local/go/bin
 
 # Default entrypoint
-ENTRYPOINT ["bash"]
+CMD ["bash"]
 

.github/workflows/unified-vs-test.yml

@@ -2,17 +2,138 @@ name: Run on Zinal
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - 'fc-*'
 
 jobs:
   build:
+    if: github.actor == 'fcruzcscs'
     runs-on: zinal
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup temporary dir
+        run: |
+          TMP_DIR=$(mktemp -d)
+          echo "TMP_DIR=$TMP_DIR" >> $GITHUB_ENV
+          echo "Using temp directory: $TMP_DIR" 
+
+      - name: Manually clone repo within tmp dir
+        run: git clone --depth 1 --branch "${GITHUB_REF_NAME}" https://github.com/${GITHUB_REPOSITORY}.git
+        working-directory: ${{ env.TMP_DIR }}
+
+      - name: List contents of TMP_DIR
+        run: ls -la
+        working-directory: ${{ env.TMP_DIR }}
+
+      - name: Run build inside Podman container
+        run: |
+          podman run --rm \
+          -v "$PWD":"$PWD":Z \
+          -v "$TMP_DIR":"$TMP_DIR":Z \
+          -w "$PWD" \
+          --env TMP_DIR="$TMP_DIR" \
+          --env GITHUB_REF_NAME="$GITHUB_REF_NAME" \
+          ghcr.io/sarus-suite/parallax/ci-runner:latest \
+          bash -euxc '
+            mkdir -p $TMP_DIR/dist
+
+            go version
+
+            export VER=opensuse-15.5
+            export HOST_ARCH="$(go env GOHOSTARCH)"
+            #export OUT="parallax-${GITHUB_REF_NAME}-${VER}-${HOST_ARCH}"
+            export OUT="parallax"
+
+            go get .
+        
+            export CGO_ENABLED=1
+            export CC=gcc
+            export GOFLAGS="-buildvcs=false"
+            export GO_LDFLAGS="-linkmode external"
+            export CGO_LDFLAGS="-g -O2"
+            export GOARCH="$HOST_ARCH"
+            export GOOS=linux
+
+            go build -v \
+              -o "$TMP_DIR/dist/$OUT" \
+              .
+           echo Built binary: "$TMP_DIR/dist/$OUT"
+           '
+        working-directory: ${{ env.TMP_DIR }}/parallax
+
+      - name: Install Bats locally
+        run: |
+          git clone --depth 1 https://github.com/bats-core/bats-core.git "$TMP_DIR/bats-core"
+          "$TMP_DIR/bats-core/install.sh" "$TMP_DIR/bats"
+        working-directory: ${{ env.TMP_DIR }}
+
+      - name: Testing podman run
+        run: |
+          export PODMAN_BINARY=$(which podman)
+          $PODMAN_BINARY version
+          export PARALLAX_BINARY=$TMP_DIR/dist/parallax
+          $PARALLAX_BINARY --version
+        working-directory: ${{ env.TMP_DIR}}
+
+      - name: Simple parallax test
+        run: |
+          # Setup env
+          export PODMAN_BINARY=$(which podman)
+          export PARALLAX_BINARY=$TMP_DIR/dist/parallax
+          export MOUNT_PROGRAM_PATH=$TMP_DIR/parallax/scripts/parallax-mount-program.sh
+          export PARALLAX_MP_SQUASHFUSE_FLAG="-o nonempty"
+          export PODMAN_ROOT="$(mktemp -d)"
+          export PODMAN_RUNROOT="$(mktemp -d)"
+          export RO_STORAGE="$(mktemp -d)"
+          export CLEAN_ROOT="$(mktemp -d)"
+          export MKSQUASHFS_PATH="$(command -v mksquashfs)"
+
+          # Test podman + parallax
+          "$PODMAN_BINARY" \
+            --root "$PODMAN_ROOT" \
+            --runroot "$PODMAN_RUNROOT" \
+            pull busybox:latest
+
+          "$PARALLAX_BINARY" \
+            --podmanRoot "$PODMAN_ROOT" \
+            --roStoragePath "$RO_STORAGE" \
+            --mksquashfsPath "$MKSQUASHFS_PATH" \
+            --log-level info \
+            --migrate \
+            --image busybox:latest
+
+          "$PODMAN_BINARY" \
+            --root "$CLEAN_ROOT" \
+            --runroot "$PODMAN_RUNROOT" \
+            --storage-opt additionalimagestore=$RO_STORAGE \
+            --storage-opt mount_program=$MOUNT_PROGRAM_PATH \
+            images
+
+          "$PODMAN_BINARY" \
+            --root "$CLEAN_ROOT" \
+            --runroot "$PODMAN_RUNROOT" \
+            --storage-opt additionalimagestore=$RO_STORAGE \
+            --storage-opt mount_program=$MOUNT_PROGRAM_PATH \
+            run --rm $PODMAN_RUN_OPTIONS busybox:latest echo ok
+
+          "$PODMAN_BINARY" \
+            --root "$PODMAN_ROOT" \
+            --runroot "$PODMAN_RUNROOT" \
+            --storage-opt mount_program=$MOUNT_PROGRAM_PATH \
+            rmi --all
+
+          rm -rf "$PODMAN_ROOT"
+          rm -rf "$PODMAN_RUNROOT"
+          rm -rf "$CLEAN_ROOT"
+          #rm -rf "$RO_STORAGE"
+        working-directory: ${{ env.TMP_DIR}}
 
-      - name: Run a script
+      - name: Run Bats tests
         run: |
-          echo "Hello from zinal runner!"
-          uname -a
+          export PODMAN_BINARY=$(which podman)
+          export PARALLAX_BINARY=$TMP_DIR/dist/parallax
+          export MOUNT_PROGRAM_PATH=$TMP_DIR/parallax/scripts/parallax-mount-program.sh
+          export PARALLAX_MP_SQUASHFUSE_FLAG="-o nonempty"
+          cd parallax
+          $TMP_DIR/bats/bin/bats tests
+        working-directory: ${{ env.TMP_DIR}}
 

scripts/parallax-mount-program.sh

@@ -36,6 +36,8 @@ fi
 : "${PARALLAX_MP_INOTIFYWAIT_CMD:=inotifywait}"
 : "${PARALLAX_MP_FUSE_OVERLAYFS_CMD:=fuse-overlayfs}"
 : "${PARALLAX_MP_SQUASHFUSE_CMD:=squashfuse}"
+# ignore squashfuse flag if not set
+#: "${PARALLAX_MP_SQUASHFUSE_FLAG:=''}"
 
 REQUIRED_CFG_VARS=(
   PARALLAX_MP_INOTIFYWAIT_CMD
@@ -163,9 +165,15 @@ do_squash_mount() {
     local squash_file="$1"
     local target_dir="$2"
 
+	if [[ -n "$PARALLAX_MP_SQUASHFUSE_FLAG" ]]; then
+		IFS=' ' read -r -a PARALLAX_MP_SQUASHFUSE_FLAG_ARR <<< "$PARALLAX_MP_SQUASHFUSE_FLAG"
+	else
+		PARALLAX_MP_SQUASHFUSE_FLAG_ARR=()
+	fi
+
 	# Here we only check if link is a symlink to the actual squash file, as this is what Parallax migration does
-    if [ -h "$squash_file" ]; then
-        run_and_log "Mounting squash file." "$SQUASHFUSE_CMD" "$squash_file" "$target_dir"
+	if [ -h "$squash_file" ]; then
+        run_and_log "Mounting squash file." "$SQUASHFUSE_CMD" "$squash_file" "$target_dir" ${PARALLAX_MP_SQUASHFUSE_FLAG_ARR[@]}
         if [ $? -ne 0 ]; then
             handle_error "squashfuse failed"
         fi

tests/helpers.bash

@@ -4,8 +4,8 @@
 
 export PODMAN_BINARY="${PODMAN_BINARY:-/mnt/nfs/git/podman/bin/podman}"
 export PARALLAX_BINARY="${PARALLAX_BINARY:-/mnt/nfs/git/parallax/parallax}"
-export MOUNT_PROGRAM_PATH="/mnt/nfs/git/parallax/scripts/parallax-mount-program.sh"
-export PODMAN_RUN_OPTIONS="--security-opt seccomp=unconfined"
+export MOUNT_PROGRAM_PATH="${MOUNT_PROGRAM_PATH:-/mnt/nfs/git/parallax/scripts/parallax-mount-program.sh}"
+export PODMAN_RUN_OPTIONS="${PODMAN_RUN_OPTIONS:---security-opt seccomp=unconfined}"
 
 setup() {
   # Seting up temp dirs and env vars