Test script

.github/workflows/docker-publish.yml

@@ -12,89 +12,107 @@ on:
 permissions:
   contents: read
 
-concurrency:
-  # if workflow for PR or push is already running stop it, and start new one
-  group: poc-storage-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  storage-push:
+  build:
+
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
       id-token: write
+
     steps:
-    - uses: actions/checkout@v4
-    - uses: docker/setup-qemu-action@v3
-    - uses: docker/[email protected]
-
-    - name: Log in to Docker Hub
-      if: github.event_name != 'pull_request'
-      uses: docker/[email protected]
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Log in to the GH Container registry
-      if: github.event_name != 'pull_request'
-      uses: docker/[email protected]
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Extract Docker metadata
-      id: meta
-      uses: docker/[email protected]
-      with:
-        images: |
-          ${{ github.repository }}
-          ghcr.io/${{ github.repository }}
-
-    - name: Get opi-api Version
-      run: echo "OPI_API_VERSION=$(go list -m -f '{{.Version}}' github.com/opiproject/opi-api)" >> $GITHUB_ENV
-
-    - name: Build and push Docker image
-      uses: docker/[email protected]
-      with:
-        context: .
-        platforms: linux/amd64,linux/arm64
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: |
-          ${{ steps.meta.outputs.labels }},
-          opi-api-version=${{ env.OPI_API_VERSION }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-
-  storage-ci:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/[email protected]
+
+      - name: Log in to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to the GH Container registry
+        if: github.event_name != 'pull_request'
+        uses: docker/[email protected]
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/[email protected]
+        with:
+          images: |
+            ${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+      - name: Get opi-api Version Info
+        run: echo "OPI_API_VERSION=$(go list -m -f '{{.Version}}' github.com/opiproject/opi-api || echo 'undefined')" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/[email protected]
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          labels: |
+            ${{ steps.meta.outputs.labels }},
+            opi-api-version=${{ env.OPI_API_VERSION }}
+
+      - name: Update Docker Hub Description
+        if: github.event_name != 'pull_request'
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN_DELETE }}
+          repository: ${{ github.repository }}
+          short-description: ${{ github.event.repository.description }}
+
+  test:
     runs-on: ubuntu-latest
     steps:
-    - name: configure HUGE pages
-      run: |
-        sync
-        echo 1 | sudo tee /proc/sys/vm/drop_caches
-        sudo mkdir -p /mnt/huge
-        grep hugetlbfs /proc/mounts || sudo mount -t hugetlbfs nodev /mnt/huge
-        echo 1024 | sudo tee /proc/sys/vm/nr_hugepages
-        echo "Check and fail if not enough"
-        grep 1024 /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
-
-    - uses: actions/checkout@v4
-    - uses: docker/setup-qemu-action@v3
-    - uses: docker/setup-buildx-action@5d9862498505fcac67b9f455d6e94ec0339f7b90
-
-    - name: Start containers
-      run: docker-compose up --build --force-recreate --detach
-
-    - name: Run Tests
-      run: ./scripts/tests.sh
-
-    - name: Logs
-      if: always()
-      run: docker-compose logs
-
-    - name: Stop containers
-      if: always()
-      run: docker-compose down --volumes --remove-orphans
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/[email protected]
+
+      - name: Install additional kernel modules needed for OPI like VRF
+        run: sudo apt-get install linux-modules-extra-$(uname -r)
+
+      - name: Load additional kernel modules needed for OPI like VRF
+        run: sudo modprobe -v vrf
+
+      - name: Start containers
+        run: docker-compose up --build --force-recreate --detach opi-test
+
+      - name: Run Tests
+        run: |
+          set -x
+          name=$(docker-compose ps | grep opi-test | awk '{print $1}')
+          rc=$(docker wait "${name}")
+          if [ "${rc}" != "0" ]; then
+              echo "opi-test failed:"
+              docker logs "${name}"
+              exit 1
+          fi
+
+          if [ -f scripts/tests.sh ]; then
+              scripts/tests.sh || exit $?
+          else
+              echo "No test script"
+          fi
+
+      - name: Logs
+        if: always()
+        run: docker-compose logs
+
+      - name: Stop containers
+        if: always()
+        run: docker-compose down --volumes --remove-orphans

docker-compose.yml

@@ -69,6 +69,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      jaeger:
+        condition: service_started
     command: sh -c "/opi-spdk-bridge -grpc_port=50051 -http_port=8082 -spdk_addr=/var/tmp/spdk.sock -redis_addr=redis:6379"
     healthcheck:
       test: grpcurl -plaintext localhost:50051 list || exit 1
@@ -77,6 +79,8 @@ services:
     image: redis:7.2.2-alpine3.18
     networks:
       - opi
+    ports:
+      - "6379:6379"
     healthcheck:
       test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
 
@@ -100,6 +104,15 @@ services:
         condition: service_healthy
     command: curl -qkL http://opi-spdk-server:8082/v1/inventory/1/inventory/2
 
+  opi-jaeger-test:
+    image: curlimages/curl:8.4.0
+    networks:
+      - opi
+    depends_on:
+      opi-spdk-client:
+        condition: service_completed_successfully
+    command: sh -c 'curl -s "http://jaeger:16686/api/traces?service=opi-spdk-bridge&lookback=20m&prettyPrint=true&limit=10" | grep operationName'
+
   opi-spdk-client:
     image: ghcr.io/opiproject/godpu:main@sha256:2b55d76814befaec963e378b1764a611f37698c70fd55bfe2ddf07f06393fa28
     networks:
@@ -109,5 +122,18 @@ services:
         condition: service_healthy
     command: storage test --addr=opi-spdk-server:50051
 
+  opi-test:
+    image: docker.io/namely/grpc-cli
+    networks:
+      - opi
+    depends_on:
+      opi-spdk-client:
+        condition: service_completed_successfully
+      opi-gw-test:
+        condition: service_completed_successfully
+      opi-jaeger-test:
+        condition: service_completed_successfully
+    command: ls opi-spdk-server:50051 opi_api.storage.v1.FrontendNvmeService -l
+
 networks:
   opi:

scripts/tests.sh

@@ -107,3 +107,5 @@ grep "Total" log.txt
 
 # this is last line
 docker-compose ps -a
+
+exit 1