From 784ce3192272576ac0927d06e4e09f58ed025c87 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Sun, 25 Feb 2024 14:01:38 -0700 Subject: [PATCH] remove scale 23_10 from ci, fix objectivefs installer for unsupported arches Signed-off-by: Travis Glenn Hansen --- .github/workflows/main.yml | 34 --------------------------------- docker/objectivefs-installer.sh | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2c9e95..a707517 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,38 +115,6 @@ jobs: SYNOLOGY_PASSWORD: ${{ secrets.SANITY_SYNOLOGY_PASSWORD }} SYNOLOGY_VOLUME: ${{ secrets.SANITY_SYNOLOGY_VOLUME }} - csi-sanity-truenas-scale-23_10: - needs: - - build-npm-linux-amd64 - strategy: - fail-fast: false - matrix: - config: - - truenas/scale/23.10/scale-iscsi.yaml - - truenas/scale/23.10/scale-nfs.yaml - # 80 char limit - - truenas/scale/23.10/scale-smb.yaml - runs-on: - - self-hosted - - Linux - - X64 - #- csi-sanity-truenas - - csi-sanity-zfs-generic - steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 - with: - name: node-modules-linux-amd64 - - name: csi-sanity - run: | - # run tests - ci/bin/run.sh - env: - TEMPLATE_CONFIG_FILE: "./ci/configs/${{ matrix.config }}" - TRUENAS_HOST: ${{ secrets.SANITY_TRUENAS_SCALE_23_10_HOST }} - TRUENAS_USERNAME: ${{ secrets.SANITY_TRUENAS_USERNAME }} - TRUENAS_PASSWORD: ${{ secrets.SANITY_TRUENAS_PASSWORD }} - csi-sanity-truenas-scale-24_04: needs: - build-npm-linux-amd64 @@ -462,7 +430,6 @@ jobs: - determine-image-tag - csi-sanity-synology-dsm6 - csi-sanity-synology-dsm7 - - csi-sanity-truenas-scale-23_10 - csi-sanity-truenas-scale-24_04 - csi-sanity-truenas-core-13_0 - csi-sanity-zfs-generic @@ -502,7 +469,6 @@ jobs: needs: - csi-sanity-synology-dsm6 - csi-sanity-synology-dsm7 - - csi-sanity-truenas-scale-23_10 - csi-sanity-truenas-scale-24_04 - csi-sanity-truenas-core-13_0 - csi-sanity-zfs-generic diff --git a/docker/objectivefs-installer.sh b/docker/objectivefs-installer.sh index 1f5e74f..907242b 100755 --- a/docker/objectivefs-installer.sh +++ b/docker/objectivefs-installer.sh @@ -22,6 +22,7 @@ elif [ "$PLATFORM" = "linux/arm64" ]; then export OBJECTIVEFS_ARCH="arm64" else echo "unsupported/unknown PLATFORM ${PLATFORM}" + exit 0 fi export DEB_FILE="objectivefs_${OBJECTIVEFS_VERSION}_${OBJECTIVEFS_ARCH}.deb"