Skip to content

Commit 77b0180

Browse files
committed
Add radio-firware to the package chain
1 parent 5b1dbf2 commit 77b0180

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

internal/e2e/updatetest/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
func fetchDebPackageLatest(t *testing.T, path, repo string) string {
2525
t.Helper()
2626

27-
repo = fmt.Sprintf("github.com/arduino/%s", repo)
27+
repo = fmt.Sprintf("github.com/%s", repo)
2828
cmd := exec.Command(
2929
"gh", "release", "list",
3030
"--repo", repo,

internal/e2e/updatetest/test.Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:trixie
22

33
RUN apt update && \
4-
apt install -y systemd systemd-sysv dbus \
4+
apt install -y systemd systemd-sysv dbus initramfs-tools\
55
sudo docker.io ca-certificates curl gnupg \
66
dpkg-dev apt-utils adduser gzip && \
77
rm -rf /var/lib/apt/lists/*
@@ -11,9 +11,10 @@ ARG ARCH=amd64
1111
COPY build/stable/arduino-app-cli*_${ARCH}.deb /tmp/stable.deb
1212
COPY build/arduino-app-cli*_${ARCH}.deb /tmp/unstable.deb
1313
COPY build/stable/arduino-router*_${ARCH}.deb /tmp/router.deb
14+
COPY build/stable/arduino-unoq-radio-firmware*_${ARCH}.deb /tmp/radio-firmware.deb
1415

15-
RUN apt update && apt install -y /tmp/stable.deb /tmp/router.deb \
16-
&& rm /tmp/stable.deb /tmp/router.deb \
16+
RUN apt update && apt install -y /tmp/stable.deb /tmp/radio-firmware.deb /tmp/router.deb \
17+
&& rm /tmp/stable.deb /tmp/router.deb /tmp/radio-firmware.deb \
1718
&& mkdir -p /var/www/html/myrepo/dists/trixie/main/binary-${ARCH} \
1819
&& mv /tmp/unstable.deb /var/www/html/myrepo/dists/trixie/main/binary-${ARCH}/
1920

internal/e2e/updatetest/update_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ func TestUpdatePackage(t *testing.T) {
2121
t.Run("Stable To Current", func(t *testing.T) {
2222
t.Cleanup(func() { os.RemoveAll("build") })
2323

24-
tagAppCli := fetchDebPackageLatest(t, "build/stable", "arduino-app-cli")
25-
fetchDebPackageLatest(t, "build/stable", "arduino-router")
24+
tagAppCli := fetchDebPackageLatest(t, "build/stable", "arduino/arduino-app-cli")
25+
fetchDebPackageLatest(t, "build/stable", "arduino/arduino-router")
26+
fetchDebPackageLatest(t, "build/stable", "bcmi-labs/arduino-deb-packages")
27+
2628
majorTag := genMajorTag(t, tagAppCli)
2729

2830
fmt.Printf("Updating from stable version %s to unstable version %s \n", tagAppCli, majorTag)
@@ -71,8 +73,10 @@ func TestUpdatePackage(t *testing.T) {
7173
t.Run("CurrentToStable", func(t *testing.T) {
7274
t.Cleanup(func() { os.RemoveAll("build") })
7375

74-
tagAppCli := fetchDebPackageLatest(t, "build", "arduino-app-cli")
75-
fetchDebPackageLatest(t, "build/stable", "arduino-router")
76+
tagAppCli := fetchDebPackageLatest(t, "build", "arduino/arduino-app-cli")
77+
fetchDebPackageLatest(t, "build/stable", "arduino/arduino-router")
78+
fetchDebPackageLatest(t, "build/stable", "bcmi-labs/arduino-deb-packages")
79+
7680
minorTag := genMinorTag(t, tagAppCli)
7781

7882
fmt.Printf("Updating from unstable version %s to stable version %s \n", minorTag, tagAppCli)
@@ -83,7 +87,7 @@ func TestUpdatePackage(t *testing.T) {
8387
const dockerImageName = "test-apt-update-unstable-image"
8488

8589
buildDockerImage(t, dockerFile, dockerImageName, arch)
86-
//TODO: t cleanup remove docker image
90+
// //TODO: t cleanup remove docker image
8791

8892
t.Run("CLI Command", func(t *testing.T) {
8993
const containerName = "apt-test-update-unstable"

0 commit comments

Comments
 (0)