Skip to content

Commit ea2e960

Browse files
Fix conformance test workflow
1 parent 25d31eb commit ea2e960

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/oci-distribution-conformance.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,22 @@ jobs:
2323
uses: actions/setup-go@v5
2424
with:
2525
check-latest: true
26-
go-version: "1.22"
26+
go-version: "1.24"
2727
- name: Start keppel
2828
run: |
29-
make build/keppel
30-
RUNNER_TRACKING_ID="" && make run-api-for-conformance-test &
29+
sudo apt-get update
30+
sudo apt-get install --no-install-recommends -y postgresql-common
31+
sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
32+
sudo pg_conftool /etc/postgresql-common/createcluster.conf set create_main_cluster false
33+
sudo apt-get install --no-install-recommends -y postgresql-17
34+
sudo chmod 777 -R /root .
35+
export PATH=/usr/lib/postgresql/17/bin:$PATH
36+
if realpath /root/go/pkg/mod/golang.org/toolchain@*/bin; then
37+
export PATH=$(realpath /root/go/pkg/mod/golang.org/toolchain@*/bin):$PATH
38+
fi
39+
40+
sudo -u postgres -E --preserve-env=PATH make build/keppel
41+
sudo -u postgres -E --preserve-env=PATH env RUNNER_TRACKING_ID="" make run-api-for-conformance-test &
3142
until curl -s http://localhost:8080/healthcheck; do sleep 0.1; done
3243
IP=$(hostname -I | awk '{print $1}')
3344
echo "SERVER_URL=http://${IP}:8080" >> $GITHUB_ENV
@@ -54,11 +65,3 @@ jobs:
5465
name: oci-test-results-${{ github.sha }}
5566
path: .out/
5667
if: always()
57-
services:
58-
postgres:
59-
image: postgres:17
60-
env:
61-
POSTGRES_PASSWORD: mysecretpassword
62-
ports:
63-
- 54321:5432
64-
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

conformance-test/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export KEPPEL_API_PUBLIC_FQDN=localhost
22
export KEPPEL_ISSUER_KEY=./conformance-test/privkey.pem
33
export KEPPEL_DB_CONNECTION_OPTIONS=sslmode=disable
4-
export KEPPEL_DB_PASSWORD=mysecretpassword
4+
export KEPPEL_DB_PASSWORD=
55
export KEPPEL_DB_PORT=54321
66
export KEPPEL_USERNAME=johndoe
77
export KEPPEL_PASSWORD=SuperSecret

0 commit comments

Comments
 (0)