From 8fe1a64be2adca7ca1e31b592d32960dcb3e8ca6 Mon Sep 17 00:00:00 2001 From: gabriel-farache Date: Thu, 5 Dec 2024 16:18:57 +0100 Subject: [PATCH] Fix e2e test by disabling eventing Signed-off-by: gabriel-farache --- .github/workflows/create-ocp-project.yaml | 3 ++- .github/workflows/extendable-workflow.yaml | 3 ++- .github/workflows/greeting.yaml | 3 ++- .github/workflows/modify-vm-resources.yaml | 3 ++- .github/workflows/move2kube-e2e.yaml | 5 +++-- .github/workflows/mta-v7.x-e2e.yaml | 3 ++- .github/workflows/mtv-migration.yaml | 3 ++- .github/workflows/mtv-plan.yaml | 3 ++- .github/workflows/request-vm-cnv.yaml | 3 ++- docs/main/move2kube/install_m2k.sh | 9 ++------- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/create-ocp-project.yaml b/.github/workflows/create-ocp-project.yaml index 13879a18..2184af2e 100644 --- a/.github/workflows/create-ocp-project.yaml +++ b/.github/workflows/create-ocp-project.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/extendable-workflow.yaml b/.github/workflows/extendable-workflow.yaml index e0c7f587..d6460471 100644 --- a/.github/workflows/extendable-workflow.yaml +++ b/.github/workflows/extendable-workflow.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/greeting.yaml b/.github/workflows/greeting.yaml index d149d6dc..202c2606 100644 --- a/.github/workflows/greeting.yaml +++ b/.github/workflows/greeting.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/modify-vm-resources.yaml b/.github/workflows/modify-vm-resources.yaml index 26cc30bd..fc832cbe 100644 --- a/.github/workflows/modify-vm-resources.yaml +++ b/.github/workflows/modify-vm-resources.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/move2kube-e2e.yaml b/.github/workflows/move2kube-e2e.yaml index 8423141a..0b0ec249 100644 --- a/.github/workflows/move2kube-e2e.yaml +++ b/.github/workflows/move2kube-e2e.yaml @@ -28,7 +28,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m @@ -64,7 +65,7 @@ jobs: } )" charts/move2kube/templates/0?-sonataflow_m2k.yaml - K8S_INSTALL=1 PRIV_ID_RSA_PATH=id_rsa PUB_ID_RSA_PATH=id_rsa.pub M2K_HELM_REPO=charts/move2kube/ TARGET_NS=default ./docs/main/move2kube/install_m2k.sh + K8S_INSTALL=1 M2K_HELM_REPO=charts/move2kube/. PRIV_ID_RSA_PATH=id_rsa PUB_ID_RSA_PATH=id_rsa.pub M2K_HELM_REPO=charts/move2kube/ TARGET_NS=default ./docs/main/move2kube/install_m2k.sh - name: Run e2e script run: | diff --git a/.github/workflows/mta-v7.x-e2e.yaml b/.github/workflows/mta-v7.x-e2e.yaml index 5b964a6c..3da10fe2 100644 --- a/.github/workflows/mta-v7.x-e2e.yaml +++ b/.github/workflows/mta-v7.x-e2e.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/mtv-migration.yaml b/.github/workflows/mtv-migration.yaml index 04b734d5..a6faa8b9 100644 --- a/.github/workflows/mtv-migration.yaml +++ b/.github/workflows/mtv-migration.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/mtv-plan.yaml b/.github/workflows/mtv-plan.yaml index c389699d..728359c3 100644 --- a/.github/workflows/mtv-plan.yaml +++ b/.github/workflows/mtv-plan.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/.github/workflows/request-vm-cnv.yaml b/.github/workflows/request-vm-cnv.yaml index fa00b2ac..27addeb9 100644 --- a/.github/workflows/request-vm-cnv.yaml +++ b/.github/workflows/request-vm-cnv.yaml @@ -30,7 +30,8 @@ jobs: - name: Deploy sonataflow-operator run: | helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart - helm install orchestrator orchestrator/orchestrator-k8s + helm install orchestrator orchestrator/orchestrator-k8s --set platform.eventing.broker.name="" + kubectl get sfp -A kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=backstage" --timeout=10m diff --git a/docs/main/move2kube/install_m2k.sh b/docs/main/move2kube/install_m2k.sh index c31f8a00..0fa3a886 100755 --- a/docs/main/move2kube/install_m2k.sh +++ b/docs/main/move2kube/install_m2k.sh @@ -1,11 +1,5 @@ #!/bin/bash -CLUSTER_CLIENT=$(which oc >/dev/null 2>&1 && echo oc || echo kubectl) - -if [[ "${CLUSTER_CLIENT}" == "oc" ]]; then - echo "Deploying on OCP cluster" -else - echo "Deploying on k8s cluster" -fi +CLUSTER_CLIENT=oc if [[ -z "${PRIV_ID_RSA_PATH}" ]]; then echo 'PRIV_ID_RSA_PATH env variable must be set to the path of the private id_rsa file to use. I.e: ${HOME}/.ssh/id_rsa' @@ -24,6 +18,7 @@ fi if [[ ! -z "${K8S_INSTALL}" ]]; then echo "Running on k8s, adapting the script" + CLUSTER_CLIENT=kubectl fi if [[ -z "${M2K_HELM_REPO}" ]]; then