From 859d78e5a798870abb47626f8b575985a4101e48 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 13 Jun 2024 04:05:14 +0200 Subject: [PATCH] btrfs-progs: ci: move Leap image to 15.6 The support of Leap 15.4 has ended, not much point to test build there so move it to 15.6 (upper bound). The lower bound is still 15.3 to catch potential backward compatibility problems. The hub image exists (https://hub.docker.com/r/kdave/ci-opensuse-leap-15.6-x86_64). Signed-off-by: David Sterba --- .github/workflows/ci-build-test-fast.yml | 8 ++++---- .github/workflows/ci-build-test.yml | 8 ++++---- ci/{ci-build-leap154 => ci-build-leap156} | 4 ++-- .../Dockerfile | 2 +- .../docker-build | 0 .../docker-run | 0 .../run-tests | 0 .../test-build | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename ci/{ci-build-leap154 => ci-build-leap156} (91%) rename ci/images/{ci-openSUSE-Leap-15.4-x86_64 => ci-openSUSE-Leap-15.6-x86_64}/Dockerfile (98%) rename ci/images/{ci-openSUSE-Leap-15.4-x86_64 => ci-openSUSE-Leap-15.6-x86_64}/docker-build (100%) rename ci/images/{ci-openSUSE-Leap-15.4-x86_64 => ci-openSUSE-Leap-15.6-x86_64}/docker-run (100%) rename ci/images/{ci-openSUSE-Leap-15.4-x86_64 => ci-openSUSE-Leap-15.6-x86_64}/run-tests (100%) rename ci/images/{ci-openSUSE-Leap-15.4-x86_64 => ci-openSUSE-Leap-15.6-x86_64}/test-build (100%) diff --git a/.github/workflows/ci-build-test-fast.yml b/.github/workflows/ci-build-test-fast.yml index 93c78128..1be24555 100644 --- a/.github/workflows/ci-build-test-fast.yml +++ b/.github/workflows/ci-build-test-fast.yml @@ -30,12 +30,12 @@ jobs: steps: - name: CI Leap 15.3 run: sudo docker run kdave/ci-opensuse-leap-15.3-x86_64 ./test-build $GITHUB_REF_NAME --disable-documentation --disable-zoned - check-leap154: - name: CI Leap 15.4 + check-leap156: + name: CI Leap 15.6 runs-on: ubuntu-24.04 steps: - - name: CI Leap 15.4 - run: sudo docker run kdave/ci-opensuse-leap-15.4-x86_64 ./test-build $GITHUB_REF_NAME --disable-documentation --disable-zoned + - name: CI Leap 15.6 + run: sudo docker run kdave/ci-opensuse-leap-15.6-x86_64 ./test-build $GITHUB_REF_NAME --disable-documentation --disable-zoned check-musl: name: CI Musl runs-on: ubuntu-24.04 diff --git a/.github/workflows/ci-build-test.yml b/.github/workflows/ci-build-test.yml index e0bb7aad..c15d6441 100644 --- a/.github/workflows/ci-build-test.yml +++ b/.github/workflows/ci-build-test.yml @@ -31,13 +31,13 @@ jobs: - uses: actions/checkout@v4 - name: CI Leap 15.3 run: ci/ci-build-leap153 - check-leap154: - name: CI Leap 15.4 + check-leap156: + name: CI Leap 15.6 runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - name: CI Leap 15.4 - run: ci/ci-build-leap154 + - name: CI Leap 15.6 + run: ci/ci-build-leap156 check-musl: name: CI Musl runs-on: ubuntu-24.04 diff --git a/ci/ci-build-leap154 b/ci/ci-build-leap156 similarity index 91% rename from ci/ci-build-leap154 rename to ci/ci-build-leap156 index 3f54a5e3..2dbdfc59 100755 --- a/ci/ci-build-leap154 +++ b/ci/ci-build-leap156 @@ -1,6 +1,6 @@ #!/bin/sh # Usage: $0 [branch] [configure options] -# Create source tarball from HEAD or given branch and build it in openSUSE Leap 15.4 CI +# Create source tarball from HEAD or given branch and build it in openSUSE Leap 15.6 CI # environment. Configure options follow branch name that can be empty. HERE=`pwd` @@ -14,7 +14,7 @@ else exit 1 fi -CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64 +CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.6-x86_64 BRANCH=${1:-HEAD} if [ "$#" -ge 1 ]; then shift diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile b/ci/images/ci-openSUSE-Leap-15.6-x86_64/Dockerfile similarity index 98% rename from ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile rename to ci/images/ci-openSUSE-Leap-15.6-x86_64/Dockerfile index f657cf18..df8af246 100644 --- a/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile +++ b/ci/images/ci-openSUSE-Leap-15.6-x86_64/Dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/leap:15.4 +FROM opensuse/leap:15.6 WORKDIR /tmp diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-build b/ci/images/ci-openSUSE-Leap-15.6-x86_64/docker-build similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-build rename to ci/images/ci-openSUSE-Leap-15.6-x86_64/docker-build diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-run b/ci/images/ci-openSUSE-Leap-15.6-x86_64/docker-run similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.4-x86_64/docker-run rename to ci/images/ci-openSUSE-Leap-15.6-x86_64/docker-run diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/run-tests b/ci/images/ci-openSUSE-Leap-15.6-x86_64/run-tests similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.4-x86_64/run-tests rename to ci/images/ci-openSUSE-Leap-15.6-x86_64/run-tests diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build b/ci/images/ci-openSUSE-Leap-15.6-x86_64/test-build similarity index 100% rename from ci/images/ci-openSUSE-Leap-15.4-x86_64/test-build rename to ci/images/ci-openSUSE-Leap-15.6-x86_64/test-build