Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Buster support #16161

Closed
wants to merge 8 commits into from
6 changes: 3 additions & 3 deletions README-ci-failures.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ details and links to the failures.
## CI environment mismatch

The CI runs its jobs in multiple Docker images. The images that it is using are
specified in `buildkite/src/Constants/COntainerImages.dhall`: the CI uses all
Debian images prefixed by `minaToolchainBuster`.
specified in `buildkite/src/Constants/ContainerImages.dhall`: the CI uses all
Debian images prefixed by `minaToolchainBullseye`.

These images are generated by the CI itself, in particular based on the content of the
`dockerfiles` directory and the `opam.export` file (which describes versions of
Expand All @@ -46,7 +46,7 @@ In this case, you should:
[Google Cloud](https://console.cloud.google.com/gcr/images/o1labs-192920/global/mina-toolchain)
where they have been automatically uploaded. Look for your branch name and
commit hash in the second column. You should find several images suffixed
with `-buster`, `-bullseye`, `-stretch` and `-focal` (Debian versions).
with `-bullseye` or `-focal` (Debian versions).
3. For each such image, retrieve its full name and hash by hovering its link and
clicking the `Copy full image name` tooltip that appears (or retrieve it on
the image's page).
Expand Down
2 changes: 1 addition & 1 deletion automation/services/watchdog/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.16-slim-buster
FROM python:3.9.16-slim-bullseye

ARG GCLOUDSDK_DOWNLOAD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-296.0.1-linux-x86_64.tar.gz"
ARG WATCHMAN_DEB_URL="http://ftp.us.debian.org/debian/pool/main/w/watchman/watchman_4.9.0-5+b1_amd64.deb"
Expand Down
6 changes: 3 additions & 3 deletions buildkite/scripts/run_promote_build_job.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# - "NETWORK=Devnet"
# - "FROM_VERSION=3.0.0devnet-tooling-dkijania-hardfork-package-gen-in-nightly-b37f50e"
# - "NEW_VERSION=3.0.0fake-ddb6fc4"
# - "CODENAMES=Focal,Buster,Bullseye"
# - "CODENAMES=Focal,Bullseye"
# - "FROM_CHANNEL=Unstable"
# - "TO_CHANNEL=Experimental"
# image: codaprotocol/ci-toolchain-base:v3
Expand All @@ -41,7 +41,7 @@ function usage() {
fi
echo " DEBIANS The comma delimitered debian names. For example: 'Daemon,Archive' "
echo " DOCKERS The comma delimitered docker names. For example: 'Daemon,Archive' "
echo " CODENAMES The Debian codenames (Bullseye, Buster etc.)"
echo " CODENAMES The Debian codenames (Bullseye, Focal etc.)"
echo " FROM_VERSION The Source Docker or Debian version "
echo " NEW_VERSION The new Debian version or new Docker tag"
echo " REMOVE_PROFILE_FROM_NAME Should we remove profile suffix from debian name"
Expand Down Expand Up @@ -112,4 +112,4 @@ if [[ "${REMOVE_PROFILE_FROM_NAME}" -eq 0 ]]; then
else
REMOVE_PROFILE_FROM_NAME="True"
fi
echo $PROMOTE_PACKAGE_DHALL_DEF'.promote_artifacts '"$DHALL_DEBIANS"' '"$DHALL_DOCKERS"' "'"${FROM_VERSION}"'" "'"${NEW_VERSION}"'" "amd64" '$PROFILES_DHALL_DEF'.Type.'"${PROFILE}"' '$NETWORK_DHALL_DEF'.Type.'"${NETWORK}"' '"${DHALL_CODENAMES}"' '$DEBIAN_CHANNEL_DHALL_DEF'.Type.'"${FROM_CHANNEL}"' '$DEBIAN_CHANNEL_DHALL_DEF'.Type.'"${TO_CHANNEL}"' "'"${TAG}"'" '${REMOVE_PROFILE_FROM_NAME}' '${DHALL_PUBLISH}' ' | dhall-to-yaml --quoted
echo $PROMOTE_PACKAGE_DHALL_DEF'.promote_artifacts '"$DHALL_DEBIANS"' '"$DHALL_DOCKERS"' "'"${FROM_VERSION}"'" "'"${NEW_VERSION}"'" "amd64" '$PROFILES_DHALL_DEF'.Type.'"${PROFILE}"' '$NETWORK_DHALL_DEF'.Type.'"${NETWORK}"' '"${DHALL_CODENAMES}"' '$DEBIAN_CHANNEL_DHALL_DEF'.Type.'"${FROM_CHANNEL}"' '$DEBIAN_CHANNEL_DHALL_DEF'.Type.'"${TO_CHANNEL}"' "'"${NEW_VERSION}"'" '${REMOVE_PROFILE_FROM_NAME}' '${DHALL_PUBLISH}' ' | dhall-to-yaml --quoted
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ported from compatible branch after fixing promotion. If this sneaky change raises concerns i can create separate PR

4 changes: 2 additions & 2 deletions buildkite/scripts/run_verify_promoted_build_job.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# - "NETWORK=Devnet"
# - "FROM_VERSION=3.0.0devnet-tooling-dkijania-hardfork-package-gen-in-nightly-b37f50e"
# - "NEW_VERSION=3.0.0fake-ddb6fc4"
# - "CODENAMES=Focal,Buster,Bullseye"
# - "CODENAMES=Focal,Bullseye"
# - "FROM_CHANNEL=Unstable"
# - "TO_CHANNEL=Experimental"
# image: codaprotocol/ci-toolchain-base:v3
Expand All @@ -41,7 +41,7 @@ function usage() {
fi
echo " DEBIANS The comma delimitered debian names. For example: 'Daemon,Archive' "
echo " DOCKERS The comma delimitered docker names. For example: 'Daemon,Archive' "
echo " CODENAMES The Debian codenames (Bullseye, Buster etc.)"
echo " CODENAMES The Debian codenames (Bullseye, Focal etc.)"
echo " NEW_VERSION The new Debian version or new Docker tag"
echo " REMOVE_PROFILE_FROM_NAME Should we remove profile suffix from debian name"
echo " PROFILE The Docker and Debian profile (Standard, Lightnet)"
Expand Down
10 changes: 0 additions & 10 deletions buildkite/src/Command/RunInToolchain.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@ let runInToolchainBullseye
environment
innerScript

let runInToolchainBuster
: List Text -> Text -> List Cmd.Type
= \(environment : List Text)
-> \(innerScript : Text)
-> runInToolchainImage
ContainerImages.minaToolchainBuster
environment
innerScript

let runInToolchain
: List Text -> Text -> List Cmd.Type
= \(environment : List Text)
Expand All @@ -55,5 +46,4 @@ in { runInToolchain = runInToolchain
, runInToolchainImage = runInToolchainImage
, runInToolchainBookworm = runInToolchainBookworm
, runInToolchainBullseye = runInToolchainBullseye
, runInToolchainBuster = runInToolchainBuster
}
2 changes: 0 additions & 2 deletions buildkite/src/Constants/ContainerImages.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
-- NOTE: minaToolchainBullseye is also used for building Ubuntu Focal packages in CI
-- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
, minaToolchainBuster =
"gcr.io/o1labs-192920/mina-toolchain@sha256:d27c15e3143a99b86155ba57696020c00e2a296b388499b3e6fb364478ddda3a"
, minaToolchainBullseye =
"gcr.io/o1labs-192920/mina-toolchain@sha256:966863de43c72c294e14762ae567404005f99654c54338a9a89b999476a36d1f"
, minaToolchainBookworm =
Expand Down
13 changes: 1 addition & 12 deletions buildkite/src/Constants/DebianVersions.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ let BuildFlags = ./BuildFlags.dhall

let S = ../Lib/SelectFiles.dhall

let DebVersion = < Bookworm | Bullseye | Buster | Jammy | Focal >
let DebVersion = < Bookworm | Bullseye | Jammy | Focal >

let capitalName =
\(debVersion : DebVersion)
-> merge
{ Bookworm = "Bookworm"
, Bullseye = "Bullseye"
, Buster = "Buster"
, Jammy = "Jammy"
, Focal = "Focal"
}
Expand All @@ -22,7 +21,6 @@ let lowerName =
-> merge
{ Bookworm = "bookworm"
, Bullseye = "bullseye"
, Buster = "buster"
, Jammy = "jammy"
, Focal = "focal"
}
Expand Down Expand Up @@ -53,14 +51,6 @@ let dependsOnStep =
, key = "${step}-deb-pkg"
}
]
, Buster =
[ { name =
"${prefix}${capitalName
debVersion}${profileSuffix}${BuildFlags.toSuffixUppercase
buildFlag}"
, key = "${step}-deb-pkg"
}
]
, Jammy =
[ { name =
"${prefix}${capitalName
Expand Down Expand Up @@ -122,7 +112,6 @@ let dirtyWhen =
-> merge
{ Bookworm = minimalDirtyWhen
, Bullseye = bullseyeDirtyWhen
, Buster = minimalDirtyWhen
, Jammy = minimalDirtyWhen
, Focal = minimalDirtyWhen
}
Expand Down
8 changes: 2 additions & 6 deletions buildkite/src/Constants/DockerVersions.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ let Network = ./Network.dhall

let Docker
: Type
= < Bookworm | Bullseye | Buster | Jammy | Focal >
= < Bookworm | Bullseye | Jammy | Focal >

let capitalName =
\(docker : Docker)
-> merge
{ Bookworm = "Bookworm"
, Bullseye = "Bullseye"
, Buster = "Buster"
, Jammy = "Jammy"
, Focal = "Focal"
}
Expand All @@ -30,7 +29,6 @@ let lowerName =
-> merge
{ Bookworm = "bookworm"
, Bullseye = "bullseye"
, Buster = "buster"
, Jammy = "jammy"
, Focal = "focal"
}
Expand Down Expand Up @@ -62,13 +60,11 @@ let dependsOn =

in merge
{ Bookworm =
[ { name = "${prefix}${profileSuffix}", key = key } ]
, Bullseye =
[ { name = "${prefix}${capitalName docker}${profileSuffix}"
, key = key
}
]
, Buster =
, Bullseye =
[ { name = "${prefix}${capitalName docker}${profileSuffix}"
, key = key
}
Expand Down
2 changes: 0 additions & 2 deletions buildkite/src/Constants/Toolchain.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ let runner =
-> merge
{ Bookworm = RunInToolchain.runInToolchainBookworm
, Bullseye = RunInToolchain.runInToolchainBullseye
, Buster = RunInToolchain.runInToolchainBuster
, Jammy = RunInToolchain.runInToolchainBookworm
, Focal = RunInToolchain.runInToolchainBullseye
}
Expand All @@ -34,7 +33,6 @@ let image =
-> merge
{ Bookworm = ContainerImages.minaToolchainBookworm
, Bullseye = ContainerImages.minaToolchainBullseye
, Buster = ContainerImages.minaToolchainBuster
, Jammy = ContainerImages.minaToolchainBookworm
, Focal = ContainerImages.minaToolchainBullseye
}
Expand Down
2 changes: 1 addition & 1 deletion buildkite/src/Entrypoints/GenerateHardforkPackage.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let generate_hardfork_package =
, Cmd.quietly
"dhall-to-yaml --quoted <<< '(Pipeline.build (HardforkPackageGeneration.pipeline HardforkPackageGeneration.Spec::{=}).pipeline' | buildkite-agent pipeline upload"
, Cmd.quietly
"dhall-to-yaml --quoted <<< '(Pipeline.build (HardforkPackageGeneration.pipeline HardforkPackageGeneration.Spec::{codename = DebianVersions.DebVersion.Buster}).pipeline' | buildkite-agent pipeline upload"
"dhall-to-yaml --quoted <<< '(Pipeline.build (HardforkPackageGeneration.pipeline HardforkPackageGeneration.Spec::{codename = DebianVersions.DebVersion.Bullseye}).pipeline' | buildkite-agent pipeline upload"
]
, label = "Generate hardfork package"
, key = "generate-hardfork-package"
Expand Down
22 changes: 0 additions & 22 deletions buildkite/src/Jobs/Release/MinaArtifactBuster.dhall

This file was deleted.

35 changes: 0 additions & 35 deletions buildkite/src/Jobs/Release/MinaArtifactMainnetBuster.dhall

This file was deleted.

41 changes: 0 additions & 41 deletions buildkite/src/Jobs/Release/MinaToolchainArtifactBuster.dhall

This file was deleted.

12 changes: 6 additions & 6 deletions buildkite/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ steps:
- "NETWORK=Devnet"
- "FROM_VERSION=3.0.0devnet-tooling-dkijania-hardfork-package-gen-in-nightly-b37f50e"
- "NEW_VERSION=3.0.0fake-ddb6fc4"
- "CODENAMES=Focal,Buster,Bullseye"
- "CODENAMES=Focal,Bullseye"
- "FROM_CHANNEL=Unstable"
- "TO_CHANNEL=Experimental"
image: codaprotocol/ci-toolchain-base:v3
Expand All @@ -146,11 +146,11 @@ Above definition one need to paste into steps edit box for given pipeline and th

All list of available parameters:

- DEBIANS - The comma delimitered debian names. For example: `Daemon,Archive`. All available names are located in `buildkite/src/Constans/DebianPackage.dhall` files. Only CamelCase format is supported
- DEBIANS - The comma delimited debian names. For example: `Daemon,Archive`. All available names are located in `buildkite/src/Constans/DebianPackage.dhall` files. Only CamelCase format is supported

- DOCKERS - The comma delimitered docker names. For example: `Daemon,Archive`. All available names are located in `buildkite/src/Constans/Artifacts.dhall` files. Only CamelCase format is supported
- DOCKERS - The comma delimited docker names. For example: `Daemon,Archive`. All available names are located in `buildkite/src/Constans/Artifacts.dhall` files. Only CamelCase format is supported

- CODENAMES - The Debian codenames `Bullseye,Buster,Focal`. All available names are located in `buildkite/src/Constans/DebianVersions.dhall`. Only CamelCase format is supported
- CODENAMES - The Debian codenames `Bullseye,Focal`. All available names are located in `buildkite/src/Constans/DebianVersions.dhall`. Only CamelCase format is supported

- FROM_VERSION - The Source Docker or Debian version

Expand Down Expand Up @@ -187,7 +187,7 @@ Pipeline with create 6 jobs for each Docker and Debian component separately.
- "FROM_VERSION=3.0.0devnet-tooling-dkijania-hardfork-package-gen-in-nightly-b37f50e"
- "NEW_VERSION=3.0.0-ddb6fc4"
- "PUBLISH"=1
- "CODENAMES=Focal,Buster,Bullseye"
- "CODENAMES=Focal,Bullseye"
- "FROM_CHANNEL=Unstable"
- "TO_CHANNEL=Devnet"

Expand All @@ -202,6 +202,6 @@ We want only to move dockers from gcr to dockerhub without changing version. Cur
- "NETWORK=Devnet"
- "FROM_VERSION=3.0.0-dc6bf78"
- "NEW_VERSION=3.0.0-dc6bf78"
- "CODENAMES=Focal,Buster,Bullseye"
- "CODENAMES=Focal,Bullseye"
- "PUBLISH=1"
```
8 changes: 0 additions & 8 deletions dockerfiles/Dockerfile-mina-daemon
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ ENV DEBIAN_FRONTEND noninteractive
# We do not install the below platform-specific dependencies,
# and instead assume that apt will install the proper deps based on the package definition.
# The packages are noted here just for clarity/documentation.
# Stretch-only Deps:
# libffi6
# libprocps6
# libjemalloc1
# Buster-only Deps:
# libffi7
# libprocps7
# libjemalloc2
# Bullseye/Focal-only Deps:
# libffi7
# libprocps8
Expand Down
8 changes: 0 additions & 8 deletions dockerfiles/Dockerfile-mina-test-suite
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ ENV DEBIAN_FRONTEND noninteractive
# We do not install the below platform-specific dependencies,
# and instead assume that apt will install the proper deps based on the package definition.
# The packages are noted here just for clarity/documentation.
# Stretch-only Deps:
# libffi6
# libprocps6
# libjemalloc1
# Buster-only Deps:
# libffi7
# libprocps7
# libjemalloc2
# Bullseye/Focal-only Deps:
# libffi7
# libprocps8
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/stages/1-build-deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The "build-deps" stage
# - Installs all compilers/interpreters, tools, and OS packages on the given debian or ubuntu image
#################################################################################################
# Supports debian:buster-slim, debian:bullseye-slim, and ubuntu:focal
# Supports debian:bullseye-slim, and ubuntu:focal
ARG image=ubuntu:focal
FROM ${image} AS build-deps

Expand Down
Loading