diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 921aab2..60cfa96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -277,6 +277,8 @@ jobs: OBJECTIVEFS_ACCESS_KEY: ${{ secrets.SANITY_OBJECTIVEFS_ACCESS_KEY }} OBJECTIVEFS_PASSPHRASE: ${{ secrets.SANITY_OBJECTIVEFS_PASSPHRASE }} + # these secrets need to match the above secrets for staging/etc + CSI_SANITY_SECRETS: /root/csi-secrets/objectivefs-secrets.yaml CSI_SANITY_SKIP: "should fail when requesting to create a snapshot with already existing name and different source volume ID|should fail when requesting to create a volume with already existing name and different capacity" # client drivers diff --git a/ci/bin/launch-csi-sanity.sh b/ci/bin/launch-csi-sanity.sh index 9e2cb36..d8a0b55 100755 --- a/ci/bin/launch-csi-sanity.sh +++ b/ci/bin/launch-csi-sanity.sh @@ -27,6 +27,7 @@ chmod -R 777 "${CSI_SANITY_TEMP_DIR}"; # https://github.com/kubernetes-csi/csi-test/tree/master/cmd/csi-sanity # FOR DEBUG: --ginkgo.v # --csi.secrets= +# # expand size 2073741824 to have mis-alignments # expand size 2147483648 to have everything line up nicely @@ -35,6 +36,7 @@ csi-sanity --csi.endpoint "unix://${CSI_ENDPOINT}" \ --csi.stagingdir "${CSI_SANITY_TEMP_DIR}/stage" \ --csi.testvolumeexpandsize 2147483648 \ --csi.testvolumesize 1073741824 \ +--csi.secrets="${CSI_SANITY_SECRETS}" \ -ginkgo.skip "${CSI_SANITY_SKIP}" \ -ginkgo.focus "${CSI_SANITY_FOCUS}" diff --git a/src/utils/objectivefs.js b/src/utils/objectivefs.js index e9feada..15387a8 100644 --- a/src/utils/objectivefs.js +++ b/src/utils/objectivefs.js @@ -265,6 +265,8 @@ class ObjectiveFS { } } + options.env.PATH = process.env.PATH; + const cleansedLog = `${command} ${args.join(" ")}`; console.log("executing objectivefs command: %s", cleansedLog);