diff --git a/.github/scripts/setup-kyma.sh b/.github/scripts/install-kyma.sh similarity index 90% rename from .github/scripts/setup-kyma.sh rename to .github/scripts/install-kyma.sh index 2f2e56b6cb..2001bc2a23 100755 --- a/.github/scripts/setup-kyma.sh +++ b/.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 diff --git a/.github/scripts/provision_kyma_k3d.sh b/.github/scripts/provision_kyma_k3d.sh new file mode 100755 index 0000000000..5b38b87f8c --- /dev/null +++ b/.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 diff --git a/.github/workflows/accessibility-tests.yml b/.github/workflows/accessibility-tests.yml index d368ee1067..94593ab139 100644 --- a/.github/workflows/accessibility-tests.yml +++ b/.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 diff --git a/.github/workflows/pull-integration-cluster-k3d.yml b/.github/workflows/pull-integration-cluster-k3d.yml index 46990fb972..cb5e676893 100644 --- a/.github/workflows/pull-integration-cluster-k3d.yml +++ b/.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 diff --git a/.github/workflows/pull-integration-namespace-k3d.yml b/.github/workflows/pull-integration-namespace-k3d.yml index 7089475f0f..009ec689bd 100644 --- a/.github/workflows/pull-integration-namespace-k3d.yml +++ b/.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 diff --git a/.github/workflows/pull-kyma-integration-tests.yml b/.github/workflows/pull-kyma-integration-tests.yml index f73c3c36e4..5fc80ff86a 100644 --- a/.github/workflows/pull-kyma-integration-tests.yml +++ b/.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 diff --git a/.github/workflows/pull-lighthouse.yml b/.github/workflows/pull-lighthouse.yml index 395eb0ac79..583c17e7b6 100644 --- a/.github/workflows/pull-lighthouse.yml +++ b/.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 diff --git a/.github/workflows/pull-smoke-test-prod.yml b/.github/workflows/pull-smoke-test-prod.yml index 98dca94a77..a87dc11901 100644 --- a/.github/workflows/pull-smoke-test-prod.yml +++ b/.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 diff --git a/.github/workflows/pull-smoke-test-stage.yml b/.github/workflows/pull-smoke-test-stage.yml index 2b076d9f3f..1f7d84458e 100644 --- a/.github/workflows/pull-smoke-test-stage.yml +++ b/.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