diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 81f1994b6..e92f79f35 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -140,12 +140,12 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].encrypted" false yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].count" 2 yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].volumeClaimTemplates[0].spec.resources.requests.storage" 6Gi kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: | @@ -219,11 +219,11 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].encrypted" false cat tests/manifests/test-on-pvc-db.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -287,12 +287,12 @@ jobs: - name: deploy rook run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].encrypted" false cat tests/manifests/test-on-pvc-db.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml cat tests/manifests/test-on-pvc-wal.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -357,11 +357,11 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].count" 2 yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].volumeClaimTemplates[0].spec.resources.requests.storage" 6Gi kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -428,10 +428,10 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml cat tests/manifests/test-on-pvc-db.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -498,11 +498,11 @@ jobs: - name: deploy rook run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml cat tests/manifests/test-on-pvc-db.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml cat tests/manifests/test-on-pvc-wal.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -571,7 +571,7 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml cat tests/manifests/test-kms-vault.yaml >> tests/manifests/test-cluster-on-pvc-encrypted.yaml yq merge --inplace --arrays append tests/manifests/test-cluster-on-pvc-encrypted.yaml tests/manifests/test-kms-vault-spec.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].count" 2 @@ -580,7 +580,7 @@ jobs: yq merge --inplace --arrays append tests/manifests/test-object.yaml tests/manifests/test-kms-vault-spec.yaml sed -i 's/ver1/ver2/g' tests/manifests/test-object.yaml kubectl create -f tests/manifests/test-object.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod @@ -652,10 +652,10 @@ jobs: - name: deploy cluster run: | - kubectl create -f cluster/examples/kubernetes/ceph/operator.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/operator.yaml yq write -i tests/manifests/test-cluster-on-pvc-encrypted.yaml "spec.storage.storageClassDeviceSets[0].encrypted" false kubectl create -f tests/manifests/test-cluster-on-pvc-encrypted.yaml - kubectl create -f cluster/examples/kubernetes/ceph/toolbox.yaml + tests/scripts/github-action-helper.sh deploy_manifest_with_local_build cluster/examples/kubernetes/ceph/toolbox.yaml - name: wait for prepare pod run: tests/scripts/github-action-helper.sh wait_for_prepare_pod diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 0d884b345..3f5d913c0 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -149,9 +149,14 @@ function create_cluster_prerequisites() { kubectl create -f crds.yaml -f common.yaml } +function deploy_manifest_with_local_build() { + sed -i "s|image: rook/ceph:[0-9a-zA-Z.]*|image: rook/ceph:local-build|g" $1 + kubectl create -f $1 +} + function deploy_cluster() { cd cluster/examples/kubernetes/ceph - kubectl create -f operator.yaml + deploy_manifest_with_local_build operator.yaml sed -i "s|#deviceFilter:|deviceFilter: ${BLOCK/\/dev\/}|g" cluster-test.yaml kubectl create -f cluster-test.yaml kubectl create -f object-test.yaml @@ -160,7 +165,7 @@ function deploy_cluster() { kubectl create -f rbdmirror.yaml kubectl create -f filesystem-mirror.yaml kubectl create -f nfs-test.yaml - kubectl create -f toolbox.yaml + deploy_manifest_with_local_build toolbox.yaml } function wait_for_prepare_pod() {