Skip to content

Commit 59186cc

Browse files
dbuzatuustiugov
authored andcommitted
Updated workflow file to support GitHub Actions
Fixed typo in workflow Fixed path for contour scripts Removed single-node cluster step from workflow Updated curl address Resolved PR suggestions Removed redundant contour script file Signed-off-by: davidbuzatu-marian <[email protected]>
1 parent 4b0a88e commit 59186cc

File tree

5 files changed

+33
-97
lines changed

5 files changed

+33
-97
lines changed

.github/workflows/stargz_tests.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,44 +36,44 @@ jobs:
3636
]
3737

3838
steps:
39-
- name: Set up Go 1.18
40-
uses: actions/setup-go@v3
41-
with:
42-
go-version: 1.18
39+
- uses: actions/checkout@v3
40+
with:
41+
lfs: "true"
42+
- name: Checkout LFS objects
43+
run: git lfs checkout
4344

44-
- name: Check out code into the Go module directory
45-
uses: actions/checkout@v3
46-
- name: Create k8s Kind Cluster
47-
run: bash ./scripts/stargz/01-kind.sh
45+
- name: Set up Go 1.19
46+
uses: actions/setup-go@v3
47+
with:
48+
go-version: 1.19
4849

49-
- name: Install Serving
50-
run: bash ./scripts/stargz/02-serving.sh
50+
- name: Create k8s Kind Cluster
51+
run: bash ./scripts/stargz/01-kind.sh
5152

52-
- name: Install Kourier
53-
run: bash ./scripts/stargz/02-kourier.sh
53+
- name: Install Serving
54+
run: bash ./scripts/stargz/02-serving.sh
5455

55-
- name: Setup domain and autoscaler
56-
run: |
56+
- name: Install Kourier
57+
run: bash ./scripts/stargz/02-kourier.sh
58+
59+
- name: Setup domain and autoscaler
60+
run: |
5761
INGRESS_HOST="127.0.0.1"
5862
KNATIVE_DOMAIN=$INGRESS_HOST.sslip.io
5963
kubectl patch configmap -n knative-serving config-domain -p "{\"data\": {\"$KNATIVE_DOMAIN\": \"\"}}"
6064
kubectl patch configmap -n knative-serving config-autoscaler -p "{\"data\": {\"allow-zero-initial-scale\": \"true\"}}"
6165
66+
- name: Setup stock-only node
67+
run: ./scripts/cloudlab/setup_node.sh stock-only use-stargz
6268

63-
- name: Setup stock-only node
64-
run: ./scripts/cloudlab/setup_node.sh stock-only use-stargz
65-
66-
- name: Check containerd service is running
67-
run: sudo screen -list | grep "containerd"
69+
- name: Check containerd service is running
70+
run: sudo screen -list | grep "containerd"
6871

69-
- name: Check stargz-snapshotter is running
70-
run: sudo systemctl is-active --quiet stargz-snapshotter
71-
72-
- name: Setup single-node cluster
73-
run: ./scripts/cluster/create_one_node_cluster.sh stock-only
72+
- name: Check stargz-snapshotter is running
73+
run: sudo systemctl is-active --quiet stargz-snapshotter
7474

75-
- name: Run test container with kn
76-
run: kn service apply stargz-test -f ./configs/knative_workloads/stargz-node.yaml --concurrency-target 1
75+
- name: Run test container with kn
76+
run: kn service apply stargz-test -f ./configs/knative_workloads/stargz-node.yaml --concurrency-target 1
7777

78-
- name: Curl container
79-
run: curl http://stargz-test.default.192.168.1.240.sslip.io | grep "Hello World"
78+
- name: Curl container
79+
run: curl http://stargz-test.default.127.0.0.1.sslip.io | grep "Hello World"

scripts/cloudlab/setup_node.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ if [ "$SANDBOX" == "firecracker" ]; then
5959
$SCRIPTS/create_devmapper.sh
6060
fi
6161

62-
if [ -z "$USE_STARGZ" ]; then
63-
USE_STARGZ="no-stargz"
64-
fi
65-
6662
if [ "$USE_STARGZ" == "use-stargz" ]; then
6763
$SCRIPTS/stargz/setup_stock_only_stargz.sh
6864
fi

scripts/github_runner/clean_cri_runner.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
PWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2626

2727
SANDBOX=$1
28-
USE_STARGZ=$2
2928

3029
if [ -z "$SANDBOX" ]; then
3130
SANDBOX="firecracker"
@@ -104,14 +103,8 @@ if [ "$SANDBOX" == "firecracker" ]; then
104103
$PWD/../create_devmapper.sh
105104
fi
106105

107-
if [ -z "$USE_STARGZ" ]; then
108-
USE_STARGZ="no-stargz"
109-
fi
110-
111-
if [ "$USE_STARGZ" == "use-stargz" ]; then
112-
# Stop the stargz snapshotter
113-
sudo systemctl stop stargz-snapshotter
114-
sudo systemctl disable stargz-snapshotter
115-
sudo rm /etc/systemd/system/stargz-snapshotter.service
116-
sudo systemctl daemon-reload
117-
fi
106+
# Stop the stargz snapshotter
107+
sudo systemctl stop stargz-snapshotter
108+
sudo systemctl disable stargz-snapshotter
109+
sudo rm /etc/systemd/system/stargz-snapshotter.service
110+
sudo systemctl daemon-reload

scripts/stargz/02-contour.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)