Skip to content

Commit 5b5e74d

Browse files
author
Alexander Smirnov
committed
Update disto versions
1 parent eb28da8 commit 5b5e74d

9 files changed

+9
-354
lines changed

.github/workflows/test-on-push-and-pr.yml

-8
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ jobs:
3131
- name: Run amazonlinux integration tests
3232
run: DISTRO=amazonlinux make test-integ
3333

34-
centos:
35-
runs-on: ubuntu-latest
36-
37-
steps:
38-
- uses: actions/checkout@v2
39-
- name: Run centos integration tests
40-
run: DISTRO=centos make test-integ
41-
4234
debian:
4335
runs-on: ubuntu-latest
4436

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ First step is to choose the base image to be used. The supported Linux OS distri
1919

2020
- Amazon Linux 2
2121
- Alpine
22-
- CentOS
2322
- Debian
2423
- Ubuntu
2524

tests/integration/codebuild/buildspec.os.alpine.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ batch:
1515
env:
1616
variables:
1717
DISTRO_VERSION:
18-
- "3.13"
19-
- "3.14"
20-
- "3.15"
18+
- "3.17"
19+
- "3.18"
20+
- "3.19"
2121
RUNTIME_VERSION:
2222
- "3.8"
2323
- "3.9"
@@ -65,7 +65,7 @@ phases:
6565
-f "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp" \
6666
-t "${IMAGE_TAG}" \
6767
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
68-
--build-arg DISTRO_VERSION="${DISTRO_VERSION}"
68+
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" --load
6969
build:
7070
commands:
7171
- set -x

tests/integration/codebuild/buildspec.os.amazonlinux.1.yml

-104
This file was deleted.

tests/integration/codebuild/buildspec.os.amazonlinux.2.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ batch:
1717
DISTRO_VERSION:
1818
- "2"
1919
RUNTIME_VERSION:
20-
- "3.7"
21-
- "3.8"
2220
- "3.9"
2321
- "3.10"
2422
- "3.11"
@@ -62,7 +60,7 @@ phases:
6260
-t "${IMAGE_TAG}" \
6361
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
6462
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
65-
--build-arg ARCHITECTURE="${ARCHITECTURE}"
63+
--build-arg ARCHITECTURE="${ARCHITECTURE}" --load
6664
build:
6765
commands:
6866
- set -x

tests/integration/codebuild/buildspec.os.centos.yml

-112
This file was deleted.

tests/integration/codebuild/buildspec.os.debian.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ batch:
1515
env:
1616
variables:
1717
DISTRO_VERSION:
18-
- "buster"
18+
- "bookworm"
1919
- "bullseye"
2020
RUNTIME_VERSION:
21-
- "3.8"
2221
- "3.9"
2322
- "3.10"
2423
- "3.11"
@@ -64,7 +63,7 @@ phases:
6463
-f "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp" \
6564
-t "${IMAGE_TAG}" \
6665
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
67-
--build-arg DISTRO_VERSION="${DISTRO_VERSION}"
66+
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" --load
6867
build:
6968
commands:
7069
- set -x

tests/integration/codebuild/buildspec.os.ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ batch:
1717
DISTRO_VERSION:
1818
- "20.04"
1919
- "22.04"
20+
- "24.04"
2021
RUNTIME_VERSION:
21-
- "3.8"
2222
- "3.9"
2323
- "3.10"
2424
- "3.11"
@@ -61,7 +61,7 @@ phases:
6161
-f "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp" \
6262
-t "${IMAGE_TAG}" \
6363
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
64-
--build-arg DISTRO_VERSION="${DISTRO_VERSION}"
64+
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" --load
6565
build:
6666
commands:
6767
- set -x

0 commit comments

Comments
 (0)