Skip to content

Commit ee4c157

Browse files
committed
Docker: Firefox stable latest version for ARM64
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 70ac588 commit ee4c157

File tree

5 files changed

+73
-57
lines changed

5 files changed

+73
-57
lines changed

.github/workflows/helm-chart-test.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,68 +40,68 @@ jobs:
4040
matrix:
4141
include:
4242
- k8s-version: 'v1.26.15'
43-
test-strategy: disabled
4443
cluster: 'minikube'
4544
helm-version: 'v3.11.3'
4645
docker-version: '26.1.4'
47-
python-version: '3.8'
46+
python-version: '3.9'
4847
test-upgrade: true
4948
service-mesh: false
50-
os: ubuntu-24.04
49+
os: ubuntu-22.04
50+
test-strategy: disabled
5151
- k8s-version: 'v1.27.16'
52-
test-strategy: job
5352
cluster: 'minikube'
5453
helm-version: 'v3.12.3'
5554
docker-version: '26.1.4'
5655
python-version: '3.9'
5756
test-upgrade: true
5857
service-mesh: true
59-
os: ubuntu-24.04
58+
os: ubuntu-22.04
59+
test-strategy: job
6060
- k8s-version: 'v1.28.15'
61-
test-strategy: deployment
6261
cluster: 'minikube'
6362
helm-version: 'v3.13.3'
6463
docker-version: '26.1.4'
6564
python-version: '3.10'
6665
test-upgrade: true
6766
service-mesh: true
68-
os: ubuntu-24.04
69-
- k8s-version: 'v1.29.13'
70-
test-strategy: job_https
67+
os: ubuntu-22.04
68+
test-strategy: deployment
69+
- k8s-version: 'v1.29.14'
7170
cluster: 'minikube'
7271
helm-version: 'v3.14.3'
7372
docker-version: '27.5.1'
7473
python-version: '3.11'
7574
test-upgrade: true
7675
service-mesh: false
77-
os: ubuntu-24.04
78-
- k8s-version: 'v1.30.9'
79-
test-strategy: job_hostname
76+
os: ubuntu-22.04
77+
test-strategy: job_https
78+
- k8s-version: 'v1.30.10'
8079
cluster: 'minikube'
8180
helm-version: 'v3.15.4'
8281
docker-version: '27.5.1'
8382
python-version: '3.12'
8483
test-upgrade: true
8584
service-mesh: false
86-
os: ubuntu-24.04
87-
- k8s-version: 'v1.31.5'
88-
test-strategy: deployment_https
85+
os: ubuntu-22.04
86+
test-strategy: job_hostname
87+
- k8s-version: 'v1.31.6'
8988
cluster: 'minikube'
9089
helm-version: 'v3.16.4'
91-
docker-version: '28.0.1'
90+
docker-version: '27.4.1'
9291
python-version: '3.13'
9392
test-upgrade: true
9493
service-mesh: false
95-
os: ubuntu-24.04
96-
- k8s-version: 'v1.32.1'
97-
test-strategy: playwright_connect_grid
94+
os: ubuntu-22.04
95+
test-strategy: deployment_https
96+
- k8s-version: 'v1.32.2'
9897
cluster: 'minikube'
9998
helm-version: 'v3.17.0'
100-
docker-version: '28.0.1'
99+
docker-version: '26.1.4'
101100
python-version: '3.10'
102101
test-upgrade: true
103102
service-mesh: true
104-
os: ubuntu-24.04
103+
os: ubuntu-22.04
104+
test-strategy: playwright_connect_grid
105105
env:
106106
CLUSTER: ${{ matrix.cluster }}
107107
KUBERNETES_VERSION: ${{ matrix.k8s-version }}

.github/workflows/k8s-scaling-test.yml

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,47 +56,53 @@ env:
5656
jobs:
5757
build-and-test:
5858
name: Test K8s
59-
runs-on: ubuntu-24.04
59+
runs-on: ${{ matrix.os }}
6060
strategy:
6161
fail-fast: false
6262
matrix:
6363
include:
64-
- k8s-version: 'v1.31.5'
64+
- k8s-version: 'v1.27.16'
65+
cluster: 'minikube'
66+
helm-version: 'v3.12.3'
67+
docker-version: '26.1.4'
68+
python-version: '3.9'
69+
os: ubuntu-22.04
6570
test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
71+
- k8s-version: 'v1.28.15'
6672
cluster: 'minikube'
67-
helm-version: 'v3.16.4'
68-
docker-version: '28.0.1'
69-
python-version: '3.13'
70-
- k8s-version: 'v1.31.5'
73+
helm-version: 'v3.13.3'
74+
docker-version: '26.1.4'
75+
python-version: '3.10'
76+
os: ubuntu-22.04
7177
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
78+
- k8s-version: 'v1.29.14'
7279
cluster: 'minikube'
73-
helm-version: 'v3.16.4'
74-
docker-version: '28.0.1'
75-
python-version: '3.13'
76-
- k8s-version: 'v1.31.5'
80+
helm-version: 'v3.14.3'
81+
docker-version: '27.5.1'
82+
python-version: '3.11'
83+
os: ubuntu-22.04
7784
test-strategy: test_k8s_autoscaling_job_count_strategy_default
85+
- k8s-version: 'v1.30.10'
7886
cluster: 'minikube'
79-
helm-version: 'v3.16.4'
80-
docker-version: '28.0.1'
81-
python-version: '3.13'
82-
- k8s-version: 'v1.31.5'
87+
helm-version: 'v3.15.4'
88+
docker-version: '27.5.1'
89+
python-version: '3.12'
90+
os: ubuntu-22.04
8391
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
92+
- k8s-version: 'v1.31.6'
8493
cluster: 'minikube'
8594
helm-version: 'v3.16.4'
86-
docker-version: '28.0.1'
95+
docker-version: '27.4.1'
8796
python-version: '3.13'
88-
- k8s-version: 'v1.31.5'
97+
os: ubuntu-22.04
8998
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
99+
- k8s-version: 'v1.32.2'
90100
cluster: 'minikube'
91-
helm-version: 'v3.16.4'
92-
docker-version: '28.0.1'
93-
python-version: '3.13'
94-
- k8s-version: 'v1.31.5'
101+
helm-version: 'v3.17.0'
102+
docker-version: '26.1.4'
103+
python-version: '3.10'
104+
os: ubuntu-22.04
95105
test-strategy: test_k8s_autoscaling_deployment_count
96-
cluster: 'minikube'
97-
helm-version: 'v3.16.4'
98-
docker-version: '28.0.1'
99-
python-version: '3.13'
100106
env:
101107
CLUSTER: ${{ matrix.cluster }}
102108
KUBERNETES_VERSION: ${{ matrix.k8s-version }}

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ check_dev_env:
6060

6161
setup_dev_env:
6262
./tests/charts/make/chart_setup_env.sh ; \
63-
make set_containerd_image_store
63+
exit_code=$$? ; \
64+
make set_containerd_image_store ; \
65+
exit $$exit_code ;
6466

6567
set_containerd_image_store:
6668
sudo mkdir -p /etc/docker

NodeFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG FIREFOX_VERSION=latest
2121
ARG FIREFOX_DOWNLOAD_URL=""
2222
ARG FIREFOX_LANG_VERSION=${FIREFOX_VERSION}
2323
RUN apt-get update -qqy && \
24-
if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
24+
if [ "$(dpkg --print-architecture)" = "amd64" ] || [ $FIREFOX_VERSION = "latest" ]; then \
2525
if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "beta-latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ] || [ $FIREFOX_VERSION = "esr-latest" ]; then \
2626
/opt/bin/install-firefox-apt.sh \
2727
&& FIREFOX_VERSION=$(echo "-$FIREFOX_VERSION" | sed 's/-latest//') \

tests/charts/make/chart_setup_env.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo "Set ENV variables"
44
CLUSTER=${CLUSTER:-"minikube"}
5-
DOCKER_VERSION=${DOCKER_VERSION:-"26.1.4"}
5+
DOCKER_VERSION=${DOCKER_VERSION:-""}
66
HELM_VERSION=${HELM_VERSION:-"latest"}
77
KUBERNETES_VERSION=${KUBERNETES_VERSION:-$(curl -L -s https://dl.k8s.io/release/stable.txt)}
88

@@ -28,6 +28,7 @@ echo \
2828
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
2929
sudo apt-get update -qq || true
3030
if [ -n "${DOCKER_VERSION}" ]; then
31+
DOCKER_VERSION_EXPECT=$DOCKER_VERSION
3132
if [[ "${DOCKER_VERSION}" == "20.10"* ]]; then
3233
DOCKER_VERSION="=5:${DOCKER_VERSION}~3-0~$(. /etc/os-release; echo "$ID")-$(. /etc/os-release; echo "$VERSION_CODENAME")"
3334
else
@@ -36,21 +37,28 @@ if [ -n "${DOCKER_VERSION}" ]; then
3637
echo "Installing package docker-ce${DOCKER_VERSION}"
3738
ALLOW_DOWNGRADE="--allow-downgrades"
3839
fi
39-
sudo apt-get install -yq ${ALLOW_DOWNGRADE} docker-ce${DOCKER_VERSION} docker-ce-cli${DOCKER_VERSION}
40-
sudo apt-get install -yq ${ALLOW_DOWNGRADE} containerd.io docker-buildx-plugin docker-compose-plugin gcc-aarch64-linux-gnu qemu-user-static
40+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} docker-ce${DOCKER_VERSION} docker-ce-cli${DOCKER_VERSION}
41+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} containerd.io docker-buildx-plugin docker-compose-plugin gcc-aarch64-linux-gnu qemu-user-static
4142
sudo chmod 666 /var/run/docker.sock
43+
if [ -n "${DOCKER_VERSION_EXPECT}" ]; then
44+
DOCKER_VERSION_ACTUAL="$(docker version --format '{{.Server.Version}}')"
45+
if [ "${DOCKER_VERSION_EXPECT}" != "${DOCKER_VERSION_ACTUAL}" ]; then
46+
exit 1
47+
fi
48+
fi
4249
docker version
4350
docker buildx version
44-
docker buildx use default
51+
docker buildx use default || true
4552
if [ "$(dpkg --print-architecture)" = "amd64" ]; then
46-
docker run --privileged --rm tonistiigi/binfmt --install all
53+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes ;
4754
else
48-
docker run --privileged --rm tonistiigi/binfmt --install all
55+
docker run --rm --privileged aptman/qus -- -r ;
56+
docker run --rm --privileged aptman/qus -s -- -p
4957
fi
5058
docker info
5159
echo "==============================="
5260
echo "Installing Docker compose for AMD64 / ARM64"
53-
DOCKER_COMPOSE_VERSION="v2.33.1"
61+
DOCKER_COMPOSE_VERSION="v2.26.0"
5462
curl -fsSL -o ./docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
5563
chmod +x ./docker-compose
5664
sudo mv ./docker-compose /usr/libexec/docker/cli-plugins
@@ -95,14 +103,14 @@ elif [ "${CLUSTER}" = "minikube" ]; then
95103
go version
96104
echo "==============================="
97105
echo "Installing CRI-CTL (CLI for CRI-compatible container runtimes)"
98-
CRICTL_VERSION="v1.32.0"
106+
CRICTL_VERSION="v1.30.0"
99107
curl -fsSL -o crictl.tar.gz https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-$CRICTL_VERSION-linux-$(dpkg --print-architecture).tar.gz
100108
sudo tar -xf crictl.tar.gz -C /usr/local/bin
101109
rm -rf crictl.tar.gz
102110
crictl --version || true
103111
echo "==============================="
104112
echo "Installing CRI-Dockerd"
105-
CRI_DOCKERD_VERSION="0.3.16"
113+
CRI_DOCKERD_VERSION="0.3.14"
106114
curl -fsSL -o cri-dockerd.tgz https://github.com/Mirantis/cri-dockerd/releases/download/v$CRI_DOCKERD_VERSION/cri-dockerd-$CRI_DOCKERD_VERSION.$(dpkg --print-architecture).tgz
107115
sudo tar -xf cri-dockerd.tgz -C /tmp
108116
sudo mv /tmp/cri-dockerd/cri-dockerd /usr/local/bin/cri-dockerd
@@ -120,7 +128,7 @@ elif [ "${CLUSTER}" = "minikube" ]; then
120128
cri-dockerd --version
121129
echo "==============================="
122130
echo "Installing CNI-Plugins (Container Network Interface)"
123-
CNI_PLUGIN_VERSION="v1.6.2"
131+
CNI_PLUGIN_VERSION="v1.4.0"
124132
CNI_PLUGIN_TAR="cni-plugins-linux-$(dpkg --print-architecture)-$CNI_PLUGIN_VERSION.tgz"
125133
CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"
126134
curl -sLO "https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGIN_VERSION/$CNI_PLUGIN_TAR"

0 commit comments

Comments
 (0)