From 96126a62fcc5fb2634e24f59ae60d14fc92cbb8e Mon Sep 17 00:00:00 2001 From: jessebot Date: Wed, 24 Jul 2024 17:40:00 +0200 Subject: [PATCH] pass in --set=fullnameOverride=nextcloud to ct command for S3 test, and fix up k8s Job for testing S3 to use curlimages/curl and properly use array items for /bin/sh and -c Signed-off-by: jessebot --- .github/test_upload_job.yaml | 6 +++--- .github/workflows/lint-test.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/test_upload_job.yaml b/.github/test_upload_job.yaml index c0c38cf6..97c80cc6 100644 --- a/.github/test_upload_job.yaml +++ b/.github/test_upload_job.yaml @@ -10,11 +10,11 @@ spec: spec: containers: - name: create-nextcloud-file - image: alpine + image: curlimages/curl command: + - /bin/sh + - -c - | - /bin/sh - -c echo "testing123" > test_upload.txt && \ curl \ -u nextcloud:changeme \ diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index b5b3ac71..55005cb2 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -85,7 +85,7 @@ jobs: # test the helm chart with s3 as the primary storage - name: S3 Enabled as Primary Storage # we need to skip the clean up so we can test adding a file - helm_args: '--namespace nextcloud --skip-clean-up --helm-extra-set-args "--set=nextcloud.objectStore.s3.enabled=true --set=nextcloud.objectStore.s3.accessKey=nextcloud --set=nextcloud.objectStore.s3.secretKey=rootpass123 --set=nextcloud.objectStore.s3.host=minio.minio.cluster.local.svc --set=nextcloud.objectStore.s3.port=9000 --set=nextcloud.objectStore.s3.bucket=nextcloud" && echo "Success 🎉"' + helm_args: '--namespace nextcloud --skip-clean-up --helm-extra-set-args "--set=fullnameOverride=nextcloud --set=nextcloud.objectStore.s3.enabled=true --set=nextcloud.objectStore.s3.accessKey=nextcloud --set=nextcloud.objectStore.s3.secretKey=rootpass123 --set=nextcloud.objectStore.s3.host=minio.minio.cluster.local.svc --set=nextcloud.objectStore.s3.port=9000 --set=nextcloud.objectStore.s3.bucket=nextcloud" && echo "Success 🎉"' steps: - name: Checkout