Skip to content

Commit d8f2e1f

Browse files
adivinhoadivinho
authored
Hetzner (#3668)
1 parent 2895695 commit d8f2e1f

File tree

5 files changed

+48
-26
lines changed

5 files changed

+48
-26
lines changed

‎ps/jenkins/mysql-shell.groovy‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,32 @@ pipeline {
387387
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
388388
}
389389
}
390+
stage('Debian Trixie (13)') {
391+
agent {
392+
label params.CLOUD == 'Hetzner' ? 'docker-x64-min' : 'docker'
393+
}
394+
steps {
395+
cleanUpWS()
396+
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
397+
buildStage("debian:trixie", "--build_deb=1")
398+
399+
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
400+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
401+
}
402+
}
403+
stage('Debian Trixie (13) ARM') {
404+
agent {
405+
label params.CLOUD == 'Hetzner' ? 'docker-aarch64' : 'docker-32gb-aarch64'
406+
}
407+
steps {
408+
cleanUpWS()
409+
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
410+
buildStage("debian:trixie", "--build_deb=1")
411+
412+
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
413+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
414+
}
415+
}
390416
stage('Centos 7 tarball') {
391417
agent {
392418
label params.CLOUD == 'Hetzner' ? 'docker-x64' : 'docker-32gb'

‎ps/jenkins/percona-server-for-mysql-8.0-docker.groovy‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ parameters {
212212
sudo apt-get install -y docker-ce docker-ce-cli containerd.io
213213
export DOCKER_CLI_EXPERIMENTAL=enabled
214214
sudo mkdir -p /usr/libexec/docker/cli-plugins/
215-
sudo curl -L https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-amd64 -o /usr/libexec/docker/cli-plugins/docker-buildx
215+
sudo curl -L https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-amd64 -o /usr/libexec/docker/cli-plugins/docker-buildx
216216
sudo chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
217217
sudo systemctl restart docker
218218
sudo apt-get install -y qemu-system binfmt-support qemu-user-static
@@ -253,9 +253,11 @@ parameters {
253253
fi
254254
sed -i "s/percona-release enable mysql-shell/PS_REPO=\"testing\";percona-release enable mysql-shell/g" ${Dockerfile}.aarch64
255255
fi
256+
sudo docker --version
256257
if [ ${ORGANIZATION} != "percona" ]; then
257-
sudo docker build -t perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-amd64 --progress plain --platform="linux/amd64" -f ${Dockerfile} .
258-
sudo docker buildx build --platform linux/arm64 -t perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-arm64 --load -f ${Dockerfile}.aarch64 .
258+
sudo docker builder prune -af
259+
sudo docker build --provenance=false -t perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-amd64 --progress plain --platform="linux/amd64" -f ${Dockerfile} .
260+
sudo docker buildx build --provenance=false --platform linux/arm64 -t perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-arm64 --load -f ${Dockerfile}.aarch64 .
259261
else
260262
sudo docker pull perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-amd64
261263
sudo docker tag perconalab/percona-server:${PS_RELEASE}.${RPM_RELEASE}-amd64 percona/percona-server:${PS_RELEASE}.${RPM_RELEASE}-amd64
@@ -273,8 +275,8 @@ parameters {
273275
fi
274276
fi
275277
if [ ${ORGANIZATION} != "percona" ]; then
276-
sudo docker build -t perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-amd64 --platform="linux/amd64" .
277-
sudo docker build -t perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-arm64 --platform="linux/arm64" .
278+
sudo docker build --provenance=false -t perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-amd64 --platform="linux/amd64" .
279+
sudo docker build --provenance=false -t perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-arm64 --platform="linux/arm64" .
278280
sudo docker tag perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-amd64 perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}
279281
else
280282
sudo docker pull perconalab/percona-mysql-router:${MYSQL_ROUTER_RELEASE}-amd64

‎ps/jenkins/percona-server-for-mysql-8.0.groovy‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void buildStage(String DOCKER_OS, String STAGE_PARAM) {
5757
else
5858
wget \$(echo ${GIT_REPO} | sed -re 's|github.com|raw.githubusercontent.com|; s|\\.git\$||')/${BRANCH}/build-ps/percona-server-8.0_builder.sh -O ps_builder.sh || curl \$(echo ${GIT_REPO} | sed -re 's|github.com|raw.githubusercontent.com|; s|\\.git\$||')/${BRANCH}/build-ps/percona-server-8.0_builder.sh -o ps_builder.sh
5959
fi
60-
grep "percona-server-server" ps_builder.sh
60+
ls -la
6161
export build_dir=\$(pwd -P)
6262
if [ "$DOCKER_OS" = "none" ]; then
6363
set -o xtrace
@@ -310,9 +310,9 @@ parameters {
310310
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
311311
script {
312312
if (env.FIPSMODE == 'YES') {
313-
buildStage("centos:7", "--build_src_rpm=1 --enable_fipsmode=1")
313+
buildStage("oraclelinux:8", "--build_src_rpm=1 --enable_fipsmode=1")
314314
} else {
315-
buildStage("centos:7", "--build_src_rpm=1")
315+
buildStage("oraclelinux:8", "--build_src_rpm=1")
316316
}
317317
}
318318

@@ -347,7 +347,7 @@ parameters {
347347
parallel {
348348
stage('Oracle Linux 8') {
349349
when {
350-
expression { env.FIPSMODE == 'NO' }
350+
expression { env.FIPSMODE == 'NO' }
351351
}
352352
agent {
353353
label params.CLOUD == 'Hetzner' ? 'docker-x64' : 'docker-32gb'
@@ -464,9 +464,6 @@ parameters {
464464
}
465465
}
466466
stage('Amazon Linux 2023') {
467-
when {
468-
expression { env.FIPSMODE == 'YES' }
469-
}
470467
agent {
471468
label params.CLOUD == 'Hetzner' ? 'docker-x64' : 'docker-32gb'
472469
}
@@ -483,9 +480,6 @@ parameters {
483480
}
484481
}
485482
stage('Amazon Linux 2023 ARM') {
486-
when {
487-
expression { env.FIPSMODE == 'YES' }
488-
}
489483
agent {
490484
label params.CLOUD == 'Hetzner' ? 'docker-aarch64' : 'docker-32gb-aarch64'
491485
}
@@ -599,7 +593,7 @@ parameters {
599593
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
600594
}
601595
}
602-
/* stage('Debian Trixie(13)') {
596+
stage('Debian Trixie(13)') {
603597
agent {
604598
label params.CLOUD == 'Hetzner' ? 'docker-x64' : 'docker-32gb'
605599
}
@@ -618,7 +612,7 @@ parameters {
618612

619613
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
620614
}
621-
}*/
615+
}
622616
stage('Ubuntu Focal(20.04) ARM') {
623617
when {
624618
expression { env.FIPSMODE == 'NO' }
@@ -717,7 +711,7 @@ parameters {
717711
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
718712
}
719713
}
720-
/* stage('Debian Trixie(13) ARM') {
714+
stage('Debian Trixie(13) ARM') {
721715
agent {
722716
label params.CLOUD == 'Hetzner' ? 'docker-aarch64' : 'docker-32gb-aarch64'
723717
}
@@ -736,7 +730,7 @@ parameters {
736730

737731
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
738732
}
739-
}*/
733+
}
740734
stage('Oracle Linux 8 binary tarball') {
741735
when {
742736
expression { env.FIPSMODE == 'NO' }

‎pxb/jenkins/pxb-80-docker.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ pipeline {
102102
sed -i "s/ps-84-lts release/ps-84-lts ${COMPONENT}/g" Dockerfile
103103
fi
104104
if [ ${ORGANIZATION} != "percona" ]; then
105-
sudo docker build --no-cache -t perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-amd64 --platform "linux/amd64" .
106-
sudo docker build --no-cache -t perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-arm64 --platform="linux/arm64" .
105+
sudo docker build --provenance=false --no-cache -t perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-amd64 --platform "linux/amd64" .
106+
sudo docker build --provenance=false --no-cache -t perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-arm64 --platform="linux/arm64" .
107107
else
108108
sudo docker pull perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-amd64
109109
sudo docker tag perconalab/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-amd64 percona/percona-xtrabackup:${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}.${RPM_RELEASE}-amd64

‎pxc/jenkins/percona-xtradb-cluster-8.0-docker.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ pipeline {
9494
fi
9595
fi
9696
if [ ${ORGANIZATION} != "percona" ]; then
97-
sudo docker build --no-cache --platform "linux/amd64" -t ${ORGANIZATION}/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-amd64 .
98-
sudo docker build --no-cache --platform "linux/amd64" --build-arg DEBUG=1 -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-debug-amd64 .
97+
sudo docker build --provenance=false --no-cache --platform "linux/amd64" -t ${ORGANIZATION}/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-amd64 .
98+
sudo docker build --provenance=false --no-cache --platform "linux/amd64" --build-arg DEBUG=1 -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-debug-amd64 .
9999
else
100100
sudo docker pull perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-amd64
101101
sudo docker tag perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-amd64 percona/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-amd64
@@ -111,8 +111,8 @@ pipeline {
111111
fi
112112
fi
113113
if [ ${ORGANIZATION} != "percona" ]; then
114-
sudo docker build --no-cache -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-arm64 --platform="linux/arm64" -f Dockerfile.aarch64 .
115-
sudo docker build --no-cache --build-arg DEBUG=1 -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-debug-arm64 --platform="linux/arm64" -f Dockerfile.aarch64 .
114+
sudo docker build --provenance=false --no-cache -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-arm64 --platform="linux/arm64" -f Dockerfile.aarch64 .
115+
sudo docker build --provenance=false --no-cache --build-arg DEBUG=1 -t perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-debug-arm64 --platform="linux/arm64" -f Dockerfile.aarch64 .
116116
else
117117
sudo docker pull perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-arm64
118118
sudo docker tag perconalab/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-arm64 percona/percona-xtradb-cluster:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}.${RPM_RELEASE}-arm64
@@ -143,7 +143,7 @@ pipeline {
143143
sed -i "s/percona-xtrabackup-80/percona-xtrabackup-${PXC_MAJOR_RELEASE}/g" Dockerfile
144144
fi
145145
if [ ${ORGANIZATION} != "percona" ]; then
146-
sudo docker build --no-cache --platform "linux/amd64" -t perconalab/percona-xtradb-cluster-operator:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}-pxc8.${MYSQL_VERSION_MINOR}-backup .
146+
sudo docker build --provenance=false --no-cache --platform "linux/amd64" -t perconalab/percona-xtradb-cluster-operator:${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}-pxc8.${MYSQL_VERSION_MINOR}-backup .
147147
fi
148148
149149
sudo docker images

0 commit comments

Comments
 (0)