Skip to content

Commit 7077991

Browse files
committed
use separate script for provision and install
1 parent be5cf32 commit 7077991

File tree

6 files changed

+33
-14
lines changed

6 files changed

+33
-14
lines changed
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
set -e
44

5-
OS="$(uname -s | tr 'A-Z' 'a-z')"
6-
75
APPLICATION_CONNECTOR_VERSION="1.1.3"
8-
echo "Using OS:" "${OS}"
96

107
if [ ! -f "./bin/kyma" ]; then
118
echo "Kyma CLI Download is starting"
@@ -15,12 +12,6 @@ if [ ! -f "./bin/kyma" ]; then
1512
echo "Kyma CLI Download finished"
1613
fi
1714

18-
echo "Provisioning k3d cluster for Kyma"
19-
k3d registry create kyma-registry --port 5001
20-
21-
# kyma alpha deploy command expects a cluster with an internal k3d registry, so we provide one
22-
k3d cluster create kyma --kubeconfig-switch-context -p 80:80@loadbalancer -p 443:443@loadbalancer --registry-use kyma-registry
23-
2415
kubectl create ns kyma-system
2516

2617
./bin/kyma alpha deploy
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
OS="$(uname -s | tr 'A-Z' 'a-z')"
6+
echo "Using OS:" "${OS}"
7+
8+
if [ ! -f "./bin/kyma" ]; then
9+
echo "Kyma CLI Download is starting"
10+
mkdir -p ./bin
11+
curl -Lo ./bin/kyma https://storage.googleapis.com/kyma-cli-unstable/kyma-"${OS}"
12+
chmod +x ./bin/kyma
13+
echo "Kyma CLI Download finished"
14+
fi
15+
16+
echo "Provisioning k3d cluster for Kyma"
17+
k3d registry create kyma-registry --port 5001
18+
19+
# kyma alpha deploy command expects a cluster with an internal k3d registry, so we provide one
20+
k3d cluster create kyma --kubeconfig-switch-context -p 80:80@loadbalancer -p 443:443@loadbalancer --registry-use kyma-registry

.github/workflows/accessibility-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
- name: Setup Kyma
2424
run: |
2525
set -o pipefail
26-
./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
26+
./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
27+
./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
2728
- uses: actions/setup-node@v4
2829
with:
2930
node-version: 20
@@ -55,5 +56,6 @@ jobs:
5556
path: |
5657
backend/backend.log
5758
kyma-alpha-deploy.log
59+
kyma-provision.log
5860
busola.log
5961
retention-days: 90

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
run: curl --silent --fail $K3D_URL | bash
2929
- name: Setup Kyma
3030
run: |
31-
./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
31+
./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
32+
./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
3233
- uses: actions/setup-node@v4
3334
with:
3435
node-version: 20
@@ -61,6 +62,7 @@ jobs:
6162
with:
6263
name: kyma-dashboard-logs-${{ github.job }}
6364
path: |
64-
kyma-alpha-deploy.log
65+
kyma-alpha-deploy.
66+
kyma-provision.log
6567
busola-build.log
6668
retention-days: 90

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
- name: Setup Kyma
3030
run: |
3131
set -o pipefail
32-
./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
32+
./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
33+
./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
3334
- uses: actions/setup-node@v4
3435
with:
3536
node-version: 20
@@ -63,4 +64,5 @@ jobs:
6364
path: |
6465
kyma-alpha-deploy.log
6566
busola-build.log
67+
kyma-provision.log
6668
retention-days: 90

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
run: curl --silent --fail $K3D_URL | bash
2929
- name: Setup Kyma
3030
run: |
31-
./.github/scripts/setup-kyma.sh | tee kyma-alpha-deploy.log
31+
./.github/scripts/provision_kyma_k3d.sh | tee kyma-provision.log
32+
./.github/scripts/install-kyma.sh | tee kyma-alpha-deploy.log
3233
- uses: actions/setup-node@v4
3334
with:
3435
node-version: 20
@@ -61,4 +62,5 @@ jobs:
6162
path: |
6263
kyma-alpha-deploy.log
6364
busola-build.log
65+
kyma-provision.log
6466
retention-days: 90

0 commit comments

Comments
 (0)