Skip to content

Commit 6aae6fe

Browse files
committed
Benchmarks check app health with makeifle
1 parent 378e5bf commit 6aae6fe

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

.github/workflows/benchmark.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,16 @@ jobs:
6161
- name: Start flask-mysql
6262
working-directory: ./sample-apps/flask-mysql
6363
run: nohup make runBenchmark & nohup make runZenDisabled &
64-
- name: Get app ports
65-
id: get-ports
66-
run: |
67-
chmod +x ./sample-apps/scripts/get_ports.sh
68-
read PORT PORT_DISABLED < <(./sample-apps/scripts/get_ports.sh ./sample-apps/flask-mysql)
69-
echo "PORT=$PORT" >> $GITHUB_OUTPUT
70-
echo "PORT_DISABLED=$PORT_DISABLED" >> $GITHUB_OUTPUT
71-
echo "Using ports: $PORT (with firewall), $PORT_DISABLED (without firewall)"
64+
7265
- name: Check app health (max 3 attempts)
7366
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
7467
with:
7568
timeout_minutes: 5
7669
max_attempts: 3
7770
command: |
7871
chmod +x ./sample-apps/scripts/health_check.sh
79-
./sample-apps/scripts/health_check.sh ${{ steps.get-ports.outputs.PORT }}
80-
./sample-apps/scripts/health_check.sh ${{ steps.get-ports.outputs.PORT_DISABLED }}
72+
cd ./sample-apps/flask-mysql && make health-check
73+
8174
- name: Install K6
8275
uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2 # v1
8376
- name: Run flask-mysql k6 Benchmark (max 3 attempts)
@@ -113,23 +106,16 @@ jobs:
113106
- name: Start app
114107
working-directory: ./sample-apps/${{ matrix.app }}
115108
run: nohup make runBenchmark & nohup make runZenDisabled &
116-
- name: Get app ports
117-
id: get-ports
118-
run: |
119-
chmod +x ./sample-apps/scripts/get_ports.sh
120-
read PORT PORT_DISABLED < <(./sample-apps/scripts/get_ports.sh ./sample-apps/${{ matrix.app }})
121-
echo "PORT=$PORT" >> $GITHUB_OUTPUT
122-
echo "PORT_DISABLED=$PORT_DISABLED" >> $GITHUB_OUTPUT
123-
echo "Using ports: $PORT (with firewall), $PORT_DISABLED (without firewall)"
109+
124110
- name: Check app health (max 3 attempts)
125111
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
126112
with:
127113
timeout_minutes: 5
128114
max_attempts: 3
129115
command: |
130116
chmod +x ./sample-apps/scripts/health_check.sh
131-
./sample-apps/scripts/health_check.sh ${{ steps.get-ports.outputs.PORT }}
132-
./sample-apps/scripts/health_check.sh ${{ steps.get-ports.outputs.PORT_DISABLED }}
117+
cd ./sample-apps/${{ matrix.app }}/ && make health-check
118+
133119
- name: Install wrk
134120
run: |
135121
sudo apt-get update

0 commit comments

Comments
 (0)