From b52e84778ed3ec1cf3a198433efcaebbe0048c85 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Tue, 21 Jan 2025 00:18:46 -0700 Subject: [PATCH] remove old TN SCALE versions, update ci to use 24.10 Signed-off-by: Travis Glenn Hansen --- .github/workflows/main.yml | 14 +++--- .../truenas/scale/22.02/scale-iscsi.yaml | 31 ------------ ci/configs/truenas/scale/22.02/scale-smb.yaml | 50 ------------------- .../truenas/scale/22.12/scale-iscsi.yaml | 38 -------------- ci/configs/truenas/scale/22.12/scale-nfs.yaml | 29 ----------- ci/configs/truenas/scale/23.10/scale-nfs.yaml | 29 ----------- ci/configs/truenas/scale/23.10/scale-smb.yaml | 50 ------------------- .../truenas/scale/24.04/scale-iscsi.yaml | 38 -------------- ci/configs/truenas/scale/24.04/scale-nfs.yaml | 29 ----------- ci/configs/truenas/scale/24.04/scale-smb.yaml | 50 ------------------- .../scale/{23.10 => 24.10}/scale-iscsi.yaml | 2 +- .../scale/{22.02 => 24.10}/scale-nfs.yaml | 0 .../scale/{22.12 => 24.10}/scale-smb.yaml | 10 ++-- 13 files changed, 13 insertions(+), 357 deletions(-) delete mode 100644 ci/configs/truenas/scale/22.02/scale-iscsi.yaml delete mode 100644 ci/configs/truenas/scale/22.02/scale-smb.yaml delete mode 100644 ci/configs/truenas/scale/22.12/scale-iscsi.yaml delete mode 100644 ci/configs/truenas/scale/22.12/scale-nfs.yaml delete mode 100644 ci/configs/truenas/scale/23.10/scale-nfs.yaml delete mode 100644 ci/configs/truenas/scale/23.10/scale-smb.yaml delete mode 100644 ci/configs/truenas/scale/24.04/scale-iscsi.yaml delete mode 100644 ci/configs/truenas/scale/24.04/scale-nfs.yaml delete mode 100644 ci/configs/truenas/scale/24.04/scale-smb.yaml rename ci/configs/truenas/scale/{23.10 => 24.10}/scale-iscsi.yaml (98%) rename ci/configs/truenas/scale/{22.02 => 24.10}/scale-nfs.yaml (100%) rename ci/configs/truenas/scale/{22.12 => 24.10}/scale-smb.yaml (89%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5d4f0c..47b6c73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,7 +115,7 @@ jobs: SYNOLOGY_PASSWORD: ${{ secrets.SANITY_SYNOLOGY_PASSWORD }} SYNOLOGY_VOLUME: ${{ secrets.SANITY_SYNOLOGY_VOLUME }} - csi-sanity-truenas-scale-24_04: + csi-sanity-truenas-scale-24_10: needs: - build-npm-linux-amd64 strategy: @@ -123,10 +123,10 @@ jobs: max-parallel: 1 matrix: config: - - truenas/scale/24.04/scale-iscsi.yaml - - truenas/scale/24.04/scale-nfs.yaml + - truenas/scale/24.10/scale-iscsi.yaml + - truenas/scale/24.10/scale-nfs.yaml # 80 char limit - - truenas/scale/24.04/scale-smb.yaml + - truenas/scale/24.10/scale-smb.yaml runs-on: - self-hosted - Linux @@ -144,7 +144,7 @@ jobs: ci/bin/run.sh env: TEMPLATE_CONFIG_FILE: "./ci/configs/${{ matrix.config }}" - TRUENAS_HOST: ${{ secrets.SANITY_TRUENAS_SCALE_24_04_HOST }} + TRUENAS_HOST: ${{ secrets.SANITY_TRUENAS_SCALE_HOST }} TRUENAS_USERNAME: ${{ secrets.SANITY_TRUENAS_USERNAME }} TRUENAS_PASSWORD: ${{ secrets.SANITY_TRUENAS_PASSWORD }} @@ -435,7 +435,7 @@ jobs: - determine-image-tag - csi-sanity-synology-dsm6 - csi-sanity-synology-dsm7 - - csi-sanity-truenas-scale-24_04 + - csi-sanity-truenas-scale-24_10 - csi-sanity-truenas-core-13_0 - csi-sanity-zfs-generic - csi-sanity-objectivefs @@ -475,7 +475,7 @@ jobs: needs: - csi-sanity-synology-dsm6 - csi-sanity-synology-dsm7 - - csi-sanity-truenas-scale-24_04 + - csi-sanity-truenas-scale-24_10 - csi-sanity-truenas-core-13_0 - csi-sanity-zfs-generic - csi-sanity-objectivefs diff --git a/ci/configs/truenas/scale/22.02/scale-iscsi.yaml b/ci/configs/truenas/scale/22.02/scale-iscsi.yaml deleted file mode 100644 index b6b6f43..0000000 --- a/ci/configs/truenas/scale/22.02/scale-iscsi.yaml +++ /dev/null @@ -1,31 +0,0 @@ -driver: freenas-api-iscsi - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - zvolCompression: - zvolDedup: - zvolEnableReservation: false - zvolBlocksize: - -iscsi: - targetPortal: ${TRUENAS_HOST} - interface: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - targetGroups: - - targetGroupPortalGroup: 1 - targetGroupInitiatorGroup: 1 - targetGroupAuthType: None - targetGroupAuthGroup: - # 0-100 (0 == ignore) - extentAvailThreshold: 0 diff --git a/ci/configs/truenas/scale/22.02/scale-smb.yaml b/ci/configs/truenas/scale/22.02/scale-smb.yaml deleted file mode 100644 index 2a8861e..0000000 --- a/ci/configs/truenas/scale/22.02/scale-smb.yaml +++ /dev/null @@ -1,50 +0,0 @@ -driver: freenas-api-smb - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0770" - datasetPermissionsUser: 1001 - datasetPermissionsGroup: 1001 - -smb: - shareHost: ${TRUENAS_HOST} - #nameTemplate: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - shareAuxiliaryConfigurationTemplate: | - #guest ok = yes - #guest only = yes - shareHome: false - shareAllowedHosts: [] - shareDeniedHosts: [] - #shareDefaultPermissions: true - shareGuestOk: false - #shareGuestOnly: true - #shareShowHiddenFiles: true - shareRecycleBin: false - shareBrowsable: false - shareAccessBasedEnumeration: true - shareTimeMachine: false - #shareStorageTask: - -node: - mount: - mount_flags: "username=smbroot,password=smbroot" - -_private: - csi: - volume: - idHash: - strategy: crc16 diff --git a/ci/configs/truenas/scale/22.12/scale-iscsi.yaml b/ci/configs/truenas/scale/22.12/scale-iscsi.yaml deleted file mode 100644 index a2f7d04..0000000 --- a/ci/configs/truenas/scale/22.12/scale-iscsi.yaml +++ /dev/null @@ -1,38 +0,0 @@ -driver: freenas-api-iscsi - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - zvolCompression: - zvolDedup: - zvolEnableReservation: false - zvolBlocksize: - -iscsi: - targetPortal: ${TRUENAS_HOST} - interface: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - targetGroups: - - targetGroupPortalGroup: 1 - targetGroupInitiatorGroup: 1 - targetGroupAuthType: None - targetGroupAuthGroup: - # 0-100 (0 == ignore) - extentAvailThreshold: 0 - -# https://github.com/SCST-project/scst/blob/master/scst/src/dev_handlers/scst_vdisk.c#L203 -_private: - csi: - volume: - idHash: - strategy: crc16 diff --git a/ci/configs/truenas/scale/22.12/scale-nfs.yaml b/ci/configs/truenas/scale/22.12/scale-nfs.yaml deleted file mode 100644 index 42818ae..0000000 --- a/ci/configs/truenas/scale/22.12/scale-nfs.yaml +++ /dev/null @@ -1,29 +0,0 @@ -driver: freenas-api-nfs - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0777" - datasetPermissionsUser: 0 - datasetPermissionsGroup: 0 - -nfs: - shareHost: ${TRUENAS_HOST} - shareAlldirs: false - shareAllowedHosts: [] - shareAllowedNetworks: [] - shareMaprootUser: root - shareMaprootGroup: root - shareMapallUser: "" - shareMapallGroup: "" diff --git a/ci/configs/truenas/scale/23.10/scale-nfs.yaml b/ci/configs/truenas/scale/23.10/scale-nfs.yaml deleted file mode 100644 index 42818ae..0000000 --- a/ci/configs/truenas/scale/23.10/scale-nfs.yaml +++ /dev/null @@ -1,29 +0,0 @@ -driver: freenas-api-nfs - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0777" - datasetPermissionsUser: 0 - datasetPermissionsGroup: 0 - -nfs: - shareHost: ${TRUENAS_HOST} - shareAlldirs: false - shareAllowedHosts: [] - shareAllowedNetworks: [] - shareMaprootUser: root - shareMaprootGroup: root - shareMapallUser: "" - shareMapallGroup: "" diff --git a/ci/configs/truenas/scale/23.10/scale-smb.yaml b/ci/configs/truenas/scale/23.10/scale-smb.yaml deleted file mode 100644 index 2a8861e..0000000 --- a/ci/configs/truenas/scale/23.10/scale-smb.yaml +++ /dev/null @@ -1,50 +0,0 @@ -driver: freenas-api-smb - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0770" - datasetPermissionsUser: 1001 - datasetPermissionsGroup: 1001 - -smb: - shareHost: ${TRUENAS_HOST} - #nameTemplate: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - shareAuxiliaryConfigurationTemplate: | - #guest ok = yes - #guest only = yes - shareHome: false - shareAllowedHosts: [] - shareDeniedHosts: [] - #shareDefaultPermissions: true - shareGuestOk: false - #shareGuestOnly: true - #shareShowHiddenFiles: true - shareRecycleBin: false - shareBrowsable: false - shareAccessBasedEnumeration: true - shareTimeMachine: false - #shareStorageTask: - -node: - mount: - mount_flags: "username=smbroot,password=smbroot" - -_private: - csi: - volume: - idHash: - strategy: crc16 diff --git a/ci/configs/truenas/scale/24.04/scale-iscsi.yaml b/ci/configs/truenas/scale/24.04/scale-iscsi.yaml deleted file mode 100644 index a2f7d04..0000000 --- a/ci/configs/truenas/scale/24.04/scale-iscsi.yaml +++ /dev/null @@ -1,38 +0,0 @@ -driver: freenas-api-iscsi - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - zvolCompression: - zvolDedup: - zvolEnableReservation: false - zvolBlocksize: - -iscsi: - targetPortal: ${TRUENAS_HOST} - interface: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - targetGroups: - - targetGroupPortalGroup: 1 - targetGroupInitiatorGroup: 1 - targetGroupAuthType: None - targetGroupAuthGroup: - # 0-100 (0 == ignore) - extentAvailThreshold: 0 - -# https://github.com/SCST-project/scst/blob/master/scst/src/dev_handlers/scst_vdisk.c#L203 -_private: - csi: - volume: - idHash: - strategy: crc16 diff --git a/ci/configs/truenas/scale/24.04/scale-nfs.yaml b/ci/configs/truenas/scale/24.04/scale-nfs.yaml deleted file mode 100644 index 42818ae..0000000 --- a/ci/configs/truenas/scale/24.04/scale-nfs.yaml +++ /dev/null @@ -1,29 +0,0 @@ -driver: freenas-api-nfs - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0777" - datasetPermissionsUser: 0 - datasetPermissionsGroup: 0 - -nfs: - shareHost: ${TRUENAS_HOST} - shareAlldirs: false - shareAllowedHosts: [] - shareAllowedNetworks: [] - shareMaprootUser: root - shareMaprootGroup: root - shareMapallUser: "" - shareMapallGroup: "" diff --git a/ci/configs/truenas/scale/24.04/scale-smb.yaml b/ci/configs/truenas/scale/24.04/scale-smb.yaml deleted file mode 100644 index 2a8861e..0000000 --- a/ci/configs/truenas/scale/24.04/scale-smb.yaml +++ /dev/null @@ -1,50 +0,0 @@ -driver: freenas-api-smb - -httpConnection: - protocol: http - host: ${TRUENAS_HOST} - port: 80 - #apiKey: - username: ${TRUENAS_USERNAME} - password: ${TRUENAS_PASSWORD} - -zfs: - datasetParentName: tank/ci/${CI_BUILD_KEY}/v - detachedSnapshotsDatasetParentName: tank/ci/${CI_BUILD_KEY}/s - - datasetEnableQuotas: true - datasetEnableReservation: false - datasetPermissionsMode: "0770" - datasetPermissionsUser: 1001 - datasetPermissionsGroup: 1001 - -smb: - shareHost: ${TRUENAS_HOST} - #nameTemplate: "" - namePrefix: "csi-ci-${CI_BUILD_KEY}-" - nameSuffix: "" - shareAuxiliaryConfigurationTemplate: | - #guest ok = yes - #guest only = yes - shareHome: false - shareAllowedHosts: [] - shareDeniedHosts: [] - #shareDefaultPermissions: true - shareGuestOk: false - #shareGuestOnly: true - #shareShowHiddenFiles: true - shareRecycleBin: false - shareBrowsable: false - shareAccessBasedEnumeration: true - shareTimeMachine: false - #shareStorageTask: - -node: - mount: - mount_flags: "username=smbroot,password=smbroot" - -_private: - csi: - volume: - idHash: - strategy: crc16 diff --git a/ci/configs/truenas/scale/23.10/scale-iscsi.yaml b/ci/configs/truenas/scale/24.10/scale-iscsi.yaml similarity index 98% rename from ci/configs/truenas/scale/23.10/scale-iscsi.yaml rename to ci/configs/truenas/scale/24.10/scale-iscsi.yaml index a2f7d04..316cda2 100644 --- a/ci/configs/truenas/scale/23.10/scale-iscsi.yaml +++ b/ci/configs/truenas/scale/24.10/scale-iscsi.yaml @@ -4,7 +4,7 @@ httpConnection: protocol: http host: ${TRUENAS_HOST} port: 80 - #apiKey: + #apiKey: username: ${TRUENAS_USERNAME} password: ${TRUENAS_PASSWORD} diff --git a/ci/configs/truenas/scale/22.02/scale-nfs.yaml b/ci/configs/truenas/scale/24.10/scale-nfs.yaml similarity index 100% rename from ci/configs/truenas/scale/22.02/scale-nfs.yaml rename to ci/configs/truenas/scale/24.10/scale-nfs.yaml diff --git a/ci/configs/truenas/scale/22.12/scale-smb.yaml b/ci/configs/truenas/scale/24.10/scale-smb.yaml similarity index 89% rename from ci/configs/truenas/scale/22.12/scale-smb.yaml rename to ci/configs/truenas/scale/24.10/scale-smb.yaml index 2a8861e..a9bc10a 100644 --- a/ci/configs/truenas/scale/22.12/scale-smb.yaml +++ b/ci/configs/truenas/scale/24.10/scale-smb.yaml @@ -4,7 +4,7 @@ httpConnection: protocol: http host: ${TRUENAS_HOST} port: 80 - #apiKey: + #apiKey: username: ${TRUENAS_USERNAME} password: ${TRUENAS_PASSWORD} @@ -14,10 +14,10 @@ zfs: datasetEnableQuotas: true datasetEnableReservation: false - datasetPermissionsMode: "0770" - datasetPermissionsUser: 1001 - datasetPermissionsGroup: 1001 - + #datasetPermissionsMode: "0770" + #datasetPermissionsUser: 1001 + #datasetPermissionsGroup: 1001 + smb: shareHost: ${TRUENAS_HOST} #nameTemplate: ""