Skip to content

Commit 5f0c913

Browse files
committed
Use the ubuntu arm runner instead of the raspberry pi
1 parent 26ca204 commit 5f0c913

File tree

2 files changed

+35
-38
lines changed

2 files changed

+35
-38
lines changed

.github/workflows/release-respin.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,23 @@ jobs:
6666

6767
build-image-arm64:
6868
name: Rebuild and publish skupper-router arm64 image for an already released tag
69-
runs-on: self-hosted-arm64
69+
runs-on: ubuntu-24.04-arm
7070
steps:
7171
- name: Get the tag name and set it as the CONTAINER_TAG env variable.
7272
run: |
7373
echo "CONTAINER_TAG=${{github.event.inputs.tag}}" >> $GITHUB_ENV
7474
- uses: actions/checkout@v4
7575
with:
7676
ref: ${{github.event.inputs.tag}}
77+
- name: Install podman
78+
run: |
79+
sudo apt-get update -qq
80+
sudo apt-get -qq -y install podman
81+
podman version
82+
# Starting systemd user service
83+
systemctl --user start podman.socket
84+
echo "PODMAN_SOCK=/run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
85+
echo "DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
7786
- name: Build and publish skupper-router arm64 image
7887
run: |
7988
export VERSION="${{ env.CONTAINER_TAG }}"
@@ -104,24 +113,13 @@ jobs:
104113
- uses: actions/checkout@v4
105114
- name: Install podman
106115
run: |
107-
sudo mkdir -p /etc/apt/keyrings
108-
curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key \
109-
| gpg --dearmor \
110-
| sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
111-
echo \
112-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
113-
https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" \
114-
| sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
115-
sudo apt-get update -qq
116-
sudo apt-get -qq -y install podman
117-
podman version
118-
119-
# temporary fix for https://github.com/containers/podman/issues/21024
120-
wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb
121-
sudo apt install /tmp/conmon_2.1.2.deb
122-
123-
# Starting systemd user service
124-
systemctl --user start podman.socket
116+
sudo apt-get update -qq
117+
sudo apt-get -qq -y install podman
118+
podman version
119+
# Starting systemd user service
120+
systemctl --user start podman.socket
121+
echo "PODMAN_SOCK=/run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
122+
echo "DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
125123
126124
- name: Get the tag name and set it as the CONTAINER_TAG env variable.
127125
run: |

.github/workflows/release.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,19 @@ jobs:
5454

5555
build-image-arm64:
5656
name: Build and publish skupper-router arm64 image
57-
runs-on: self-hosted-arm64
57+
runs-on: ubuntu-24.04-arm
5858
steps:
5959
- uses: actions/checkout@v4
60+
61+
- name: Install podman
62+
run: |
63+
sudo apt-get update -qq
64+
sudo apt-get -qq -y install podman
65+
podman version
66+
# Starting systemd user service
67+
systemctl --user start podman.socket
68+
echo "PODMAN_SOCK=/run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
69+
echo "DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
6070
- name: Get the tag name and set it as the CONTAINER_TAG env variable.
6171
run: |
6272
echo "CONTAINER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
@@ -84,24 +94,13 @@ jobs:
8494
- uses: actions/checkout@v4
8595
- name: Install podman
8696
run: |
87-
sudo mkdir -p /etc/apt/keyrings
88-
curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key \
89-
| gpg --dearmor \
90-
| sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
91-
echo \
92-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
93-
https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" \
94-
| sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
95-
sudo apt-get update -qq
96-
sudo apt-get -qq -y install podman
97-
podman version
98-
99-
# temporary fix for https://github.com/containers/podman/issues/21024
100-
wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb
101-
sudo apt install /tmp/conmon_2.1.2.deb
102-
103-
# Starting systemd user service
104-
systemctl --user start podman.socket
97+
sudo apt-get update -qq
98+
sudo apt-get -qq -y install podman
99+
podman version
100+
# Starting systemd user service
101+
systemctl --user start podman.socket
102+
echo "PODMAN_SOCK=/run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
103+
echo "DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock" >> $GITHUB_ENV
105104
106105
- name: Get the tag name and set it as the CONTAINER_TAG env variable.
107106
run: |

0 commit comments

Comments
 (0)