From c63b77568cea78fb19bd3475ffc5b9a48a6499dd Mon Sep 17 00:00:00 2001
From: Alex Rodriguez <alex.rodriguez@scality.com>
Date: Fri, 30 Oct 2026 16:05:58 +0100
Subject: [PATCH 1/2] ci: pin runners and the golang image

ubuntu-latest moved to 26.04 without a PR. Pinned runners make the next
move a Renovate PR we can test. The builder now follows go.mod with an
alpine tag.

Refs: MK8S-516
---
 .github/workflows/test-e2e.yml | 2 +-
 .github/workflows/test.yml     | 2 +-
 Dockerfile                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index fdde827..be189a6 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   test-e2e:
     name: Run on Ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - name: Clone the code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1fdf8cd..d4cf401 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   test:
     name: Run on Ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - name: Clone the code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/Dockerfile b/Dockerfile
index e245fc4..309c59d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.27@sha256:2920bb124f1a2e12a1d39f0cab756ae0068441ee1da7655dec7f5e374944095b AS builder
+FROM golang:1.27.3-alpine@sha256:d200d2dd76b03a99b52651fd1325aff7dcd35422c35c01bac56571b0507f3deb AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

From d48537686aaf703e8ce1441f7d8109c082fe259c Mon Sep 17 00:00:00 2001
From: Alex Rodriguez <alex.rodriguez@scality.com>
Date: Fri, 30 Oct 2026 16:35:23 +0100
Subject: [PATCH 2/2] ci: skip the e2e job until there is a suite

The job only ran go mod tidy: make test-e2e is commented out, and the
repo has neither an e2e suite nor a test-e2e target yet. It was green
without testing anything. Skip it so the check shows as skipped, and
keep the workflow for when the suite lands.

Refs: MK8S-516
---
 .github/workflows/pre-merge.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
index 9dc15c7..1850174 100644
--- a/.github/workflows/pre-merge.yaml
+++ b/.github/workflows/pre-merge.yaml
@@ -54,6 +54,8 @@ jobs:
     secrets: inherit
 
   test-e2e:
+    # No e2e suite yet: MK8S-278.
+    if: false
     uses: ./.github/workflows/test-e2e.yml
     secrets: inherit