refactor: Use separate script for provision and install kyma

.github/scripts/setup-kyma.sh → .github/scripts/install-kyma.sh

@@ -2,9 +2,8 @@
 
 set -e
 
-OS="$(uname -s | tr 'A-Z' 'a-z')"
-
 APPLICATION_CONNECTOR_VERSION="1.1.3"
+OS="$(uname -s | tr 'A-Z' 'a-z')"
 echo "Using OS:" "${OS}"
 
 if [ ! -f "./bin/kyma" ]; then
@@ -15,13 +14,8 @@ if [ ! -f "./bin/kyma" ]; then
   echo "Kyma CLI Download finished"
 fi
 
-echo "Provisioning k3d cluster for Kyma"
-k3d registry create kyma-registry --port 5001
-
-# kyma alpha deploy command expects a cluster with an internal k3d registry, so we provide one
-k3d cluster create kyma --kubeconfig-switch-context -p 80:80@loadbalancer -p 443:443@loadbalancer --registry-use kyma-registry
-
-kubectl create ns kyma-system
+# Create if not exist
+kubectl get ns kyma-system || kubectl create ns kyma-system
 
 ./bin/kyma alpha deploy
 

.github/scripts/provision_kyma_k3d.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+OS="$(uname -s | tr 'A-Z' 'a-z')"
+echo "Using OS:" "${OS}"
+
+if [ ! -f "./bin/kyma" ]; then
+  echo "Kyma CLI Download is starting"
+  mkdir -p ./bin
+  curl -Lo ./bin/kyma https://storage.googleapis.com/kyma-cli-unstable/kyma-"${OS}"
+  chmod +x ./bin/kyma
+  echo "Kyma CLI Download finished"
+fi
+
+echo "Provisioning k3d cluster for Kyma"
+k3d registry create kyma-registry --port 5001
+
+# kyma alpha deploy command expects a cluster with an internal k3d registry, so we provide one
+k3d cluster create kyma --kubeconfig-switch-context -p 80:80@loadbalancer -p 443:443@loadbalancer --registry-use kyma-registry

.github/workflows/accessibility-tests.yml

@@ -23,7 +23,8 @@ jobs:
       - name: Setup Kyma
         run: |
           set -o pipefail
-          ./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
+          ./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
+          ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -55,5 +56,6 @@ jobs:
           path: |
             backend/backend.log
             kyma-alpha-deploy.log
+            kyma-provision.log
             busola.log
           retention-days: 90

.github/workflows/pull-integration-cluster-k3d.yml

@@ -34,6 +34,7 @@ jobs:
             --port 443:443@loadbalancer
             --wait
       - uses: actions/setup-node@v4
+        name: Setup node
         with:
           node-version: 20
       - name: Setup Busola

.github/workflows/pull-integration-namespace-k3d.yml

@@ -34,6 +34,7 @@ jobs:
             --port 443:443@loadbalancer
             --wait
       - uses: actions/setup-node@v4
+        name: Setup node
         with:
           node-version: 20
       - name: Setup Busola

.github/workflows/pull-kyma-integration-tests.yml

@@ -31,8 +31,10 @@ jobs:
         run: curl --silent --fail $K3D_URL | bash
       - name: Setup Kyma
         run: |
-          ./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
+          ./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
+          ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
+        name: Setup node
         with:
           node-version: 20
       - name: Deploy Busola
@@ -65,5 +67,6 @@ jobs:
           name: kyma-dashboard-logs-${{ github.job }}
           path: |
             kyma-alpha-deploy.log
+            kyma-provision.log
             busola-build.log
           retention-days: 90

.github/workflows/pull-lighthouse.yml

@@ -33,6 +33,7 @@ jobs:
             --port 443:443@loadbalancer
             --wait
       - uses: actions/setup-node@v4
+        name: Setup node
         with:
           node-version: 20
       - name: Run busola

.github/workflows/pull-smoke-test-prod.yml

@@ -32,7 +32,8 @@ jobs:
       - name: Setup Kyma
         run: |
           set -o pipefail
-          ./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
+          ./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
+          ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -43,7 +44,7 @@ jobs:
           ./.github/scripts/setup-busola.sh | tee busola-build.log
         env:
           ENV: prod
-      - name: run_tests
+      - name: Run tests
         shell: bash
         run: |
           k3d kubeconfig get kyma > tests/integration/fixtures/kubeconfig.yaml
@@ -66,4 +67,5 @@ jobs:
           path: |
             kyma-alpha-deploy.log
             busola-build.log
+            kyma-provision.log
           retention-days: 90

.github/workflows/pull-smoke-test-stage.yml

@@ -31,7 +31,8 @@ jobs:
         run: curl --silent --fail $K3D_URL | bash
       - name: Setup Kyma
         run: |
-          ./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
+          ./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
+          ./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -64,4 +65,5 @@ jobs:
           path: |
             kyma-alpha-deploy.log
             busola-build.log
+            kyma-provision.log
           retention-days: 90