Skip to content

Commit eb0a03a

Browse files
committed
Add workflow to run e2e tests using GitHub CI
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent a9c8133 commit eb0a03a

14 files changed

Lines changed: 208 additions & 172 deletions

File tree

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build and Test
2+
3+
on:
4+
pull_request:
5+
types: [labeled, opened, synchronize, reopened]
6+
7+
jobs:
8+
e2e:
9+
name: Build and Test
10+
runs-on: [self-hosted]
11+
permissions:
12+
contents: read
13+
packages: write
14+
15+
if: contains(github.event.pull_request.labels.*.name, 'ok-to-test')
16+
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
fetch-tags: true
23+
24+
- name: Login to GitHub Container Registry
25+
uses: docker/login-action@v3
26+
with:
27+
username: ${{ github.repository_owner }}
28+
password: ${{ secrets.GITHUB_TOKEN }}
29+
registry: ghcr.io
30+
31+
- name: make build
32+
run: |
33+
make build
34+
35+
- name: make test
36+
run: |
37+
make test

‎.github/workflows/tags.yaml‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
name: Prepare Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*.*.*'
7+
8+
jobs:
9+
prepare-release:
10+
name: Build, Test and Prepare Release
11+
runs-on: [self-hosted]
12+
permissions:
13+
contents: write
14+
packages: write
15+
16+
steps:
17+
- name: Check if release already exists
18+
id: check_release
19+
uses: actions/github-script@v7
20+
with:
21+
script: |
22+
const tag = context.ref.replace('refs/tags/', '');
23+
const releases = await github.rest.repos.listReleases({
24+
owner: context.repo.owner,
25+
repo: context.repo.repo
26+
});
27+
28+
const existing = releases.data.find(r => r.tag_name === tag && !r.draft);
29+
if (existing) {
30+
core.setOutput('skip', 'true');
31+
} else {
32+
core.setOutput('skip', 'false');
33+
}
34+
35+
- name: Skip if release already exists
36+
if: steps.check_release.outputs.skip == 'true'
37+
run: echo "Release already exists, skipping workflow."
38+
39+
- name: Checkout code
40+
if: steps.check_release.outputs.skip == 'false'
41+
uses: actions/checkout@v4
42+
with:
43+
fetch-depth: 0
44+
fetch-tags: true
45+
46+
- name: Login to GitHub Container Registry
47+
if: steps.check_release.outputs.skip == 'false'
48+
uses: docker/login-action@v3
49+
with:
50+
username: ${{ github.repository_owner }}
51+
password: ${{ secrets.GITHUB_TOKEN }}
52+
registry: ghcr.io
53+
54+
- name: Build
55+
if: steps.check_release.outputs.skip == 'false'
56+
run: make build
57+
58+
#- name: Test
59+
# if: steps.check_release.outputs.skip == 'false'
60+
# run: make test
61+
62+
- name: Commit release artifacts
63+
if: steps.check_release.outputs.skip == 'false'
64+
run: |
65+
git config user.name "github-actions"
66+
git config user.email "[email protected]"
67+
git add .
68+
git commit -m "Prepare release ${GITHUB_REF#refs/tags/}" || echo "No changes to commit"
69+
70+
- name: Create release branch
71+
if: steps.check_release.outputs.skip == 'false'
72+
run: |
73+
BRANCH_NAME="release-${GITHUB_REF#refs/tags/v}"
74+
git branch -f "$BRANCH_NAME"
75+
git push origin "$BRANCH_NAME" --force
76+
77+
- name: Create pull request if not exists
78+
if: steps.check_release.outputs.skip == 'false'
79+
uses: actions/github-script@v7
80+
with:
81+
script: |
82+
const version = context.ref.replace('refs/tags/v', '');
83+
const branch = `release-${version}`;
84+
const base = 'main'; // или другая основная ветка
85+
86+
const prs = await github.rest.pulls.list({
87+
owner: context.repo.owner,
88+
repo: context.repo.repo,
89+
head: `${context.repo.owner}:${branch}`,
90+
base
91+
});
92+
93+
if (prs.data.length === 0) {
94+
await github.rest.pulls.create({
95+
owner: context.repo.owner,
96+
repo: context.repo.repo,
97+
head: branch,
98+
base: base,
99+
title: `Release ${version}`,
100+
body: `This PR prepares the release \`${version}\`.`,
101+
draft: true
102+
});
103+
console.log(`Created draft pull request from ${branch} to ${base}`);
104+
} else {
105+
console.log(`Pull request already exists from ${branch} to ${base}`);
106+
}
107+
108+
- name: Create or reuse draft release
109+
if: steps.check_release.outputs.skip == 'false'
110+
id: create_release
111+
uses: actions/github-script@v7
112+
with:
113+
script: |
114+
const tag = context.ref.replace('refs/tags/', '');
115+
const releases = await github.rest.repos.listReleases({
116+
owner: context.repo.owner,
117+
repo: context.repo.repo
118+
});
119+
120+
let release = releases.data.find(r => r.tag_name === tag);
121+
if (!release) {
122+
release = await github.rest.repos.createRelease({
123+
owner: context.repo.owner,
124+
repo: context.repo.repo,
125+
tag_name: tag,
126+
name: `Release ${tag}`,
127+
draft: true,
128+
prerelease: false
129+
});
130+
}
131+
core.setOutput('upload_url', release.upload_url);
132+
133+
- name: Upload assets
134+
if: steps.check_release.outputs.skip == 'false'
135+
run: make upload_assets
136+
137+
- name: Delete pushed tag
138+
if: steps.check_release.outputs.skip == 'false'
139+
run: |
140+
git push --delete origin ${GITHUB_REF#refs/tags/}

‎Makefile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
.PHONY: manifests repos assets
22

3-
build:
3+
build-deps:
4+
@command -V find docker skopeo jq gh helm > /dev/null
5+
@yq --version | grep -q "mikefarah" || (echo "mikefarah/yq is required" && exit 1)
6+
@tar --version | grep -q GNU || (echo "GNU tar is required" && exit 1)
7+
@sed --version | grep -q GNU || (echo "GNU sed is required" && exit 1)
8+
@awk --version | grep -q GNU || (echo "GNU awk is required" && exit 1)
9+
10+
build: build-deps
411
make -C packages/apps/http-cache image
512
make -C packages/apps/postgres image
613
make -C packages/apps/mysql image
@@ -38,10 +45,9 @@ assets:
3845
make -C packages/core/installer/ assets
3946

4047
test:
41-
test -f _out/assets/nocloud-amd64.raw.xz || make -C packages/core/installer talos-nocloud
4248
make -C packages/core/testing apply
4349
make -C packages/core/testing test
44-
make -C packages/core/testing test-applications
50+
#make -C packages/core/testing test-applications
4551

4652
generate:
4753
hack/update-codegen.sh

‎hack/e2e.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ done
8484

8585
# Start VMs
8686
for i in 1 2 3; do
87-
qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 4 -m 8192 \
87+
qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 16384 \
8888
-device virtio-net,netdev=net0,mac=52:54:00:12:34:5$i -netdev tap,id=net0,ifname=cozy-srv$i,script=no,downscript=no \
8989
-drive file=srv$i/system.img,if=virtio,format=raw \
9090
-drive file=srv$i/seed.img,if=virtio,format=raw \

‎packages/core/builder/Chart.yaml‎

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

‎packages/core/builder/Makefile‎

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

‎packages/core/builder/config.toml‎

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

‎packages/core/builder/templates/sandbox.yaml‎

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

‎packages/core/builder/values.yaml‎

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

‎packages/core/installer/Makefile‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ diff:
1919

2020
update:
2121
hack/gen-profiles.sh
22-
IMAGE=$$(yq '.input.baseInstaller.imageRef | sub("/installer:", "/imager:")' images/talos/profiles/installer.yaml) \
23-
yq -i '.talos.imager.image = strenv(IMAGE)' ../builder/values.yaml
2422

2523
image: pre-checks image-matchbox image-cozystack image-talos
2624

27-
image-cozystack: run-builder
25+
image-cozystack:
2826
make -C ../../.. repos
2927
docker buildx build -f images/cozystack/Dockerfile ../../.. \
3028
--provenance false \
@@ -40,11 +38,11 @@ image-cozystack: run-builder
4038
yq -i '.cozystack.image = strenv(IMAGE)' values.yaml
4139
rm -f images/installer.json
4240

43-
image-talos: run-builder
41+
image-talos:
4442
test -f ../../../_out/assets/installer-amd64.tar || make talos-installer
4543
skopeo copy docker-archive:../../../_out/assets/installer-amd64.tar docker://$(REGISTRY)/talos:$(call settag,$(TALOS_VERSION))
4644

47-
image-matchbox: run-builder
45+
image-matchbox:
4846
test -f ../../../_out/assets/kernel-amd64 || make talos-kernel
4947
test -f ../../../_out/assets/initramfs-metal-amd64.xz || make talos-initramfs
5048
docker buildx build -f images/matchbox/Dockerfile ../../.. \
@@ -66,10 +64,5 @@ assets: talos-iso talos-nocloud talos-metal
6664
talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud talos-metal:
6765
mkdir -p ../../../_out/assets
6866
cat images/talos/profiles/$(subst talos-,,$@).yaml | \
69-
kubectl exec -i -n cozy-builder deploy/builder-talos-imager -- imager -
70-
kubectl exec -n cozy-builder deploy/builder-talos-imager -- tar -C /out -czf- . | \
71-
tar -C ../../../_out/assets -xzf-
72-
kubectl exec -n cozy-builder deploy/builder-talos-imager -- rm -rf /out
73-
74-
run-builder:
75-
make -C ../builder/ apply wait-for-builder
67+
docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - | \
68+
tar -C ../../../_out/assets -xzf-

0 commit comments

Comments
 (0)