From b1acf5ae49d9592c169f42e53a6ce670cb5b82d9 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 31 Aug 2022 08:58:56 -0400 Subject: [PATCH 1/2] ceph-dev*build: Switch to using jammy pbuilder image Jammy has the newer version of gcc we need. Signed-off-by: David Galloway --- ceph-dev-build/build/build_mingw | 8 ++------ ceph-dev-build/build/setup_mingw | 6 +++--- ceph-dev-new-build/build/build_mingw | 8 ++------ ceph-dev-new-build/build/setup_mingw | 6 +++--- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ceph-dev-build/build/build_mingw b/ceph-dev-build/build/build_mingw index b26c02553..086ba6902 100644 --- a/ceph-dev-build/build/build_mingw +++ b/ceph-dev-build/build/build_mingw @@ -1,10 +1,6 @@ #!/bin/bash set -ex -# We need Ubuntu Focal to cross-compile Ceph for Windows. -# Previous versions provide broken Mingw packages. -# "DIST" will be set to "windows", so we're currently overriding it with -# a hardcoded value. tmp_pbuild_script=$(mktemp /tmp/build_mingw_pbuild.XXXXXX) cat << EOF > $tmp_pbuild_script #!/bin/sh @@ -17,8 +13,8 @@ EOF chmod a+x $tmp_pbuild_script sudo pbuilder execute \ --bindmounts "$(pwd):/mnt/ceph" \ - --distribution "focal" \ - --basetgz $basedir/focal.tgz \ + --distribution "jammy" \ + --basetgz $basedir/jammy.tgz \ -- $tmp_pbuild_script rm $tmp_pbuild_script diff --git a/ceph-dev-build/build/setup_mingw b/ceph-dev-build/build/setup_mingw index 0b9441270..6a72d3b26 100644 --- a/ceph-dev-build/build/setup_mingw +++ b/ceph-dev-build/build/setup_mingw @@ -68,10 +68,10 @@ if [ "$THROWAWAY" = false ] ; then check_binary_existence $VENV $chacra_check_url fi -# We need Ubuntu Focal to cross-compile Ceph for Windows. -# Previous versions provide broken Mingw packages. +# We need Ubuntu >= Jammy to cross-compile Ceph for Windows. +# Previous versions provide broken Mingw packages/too old gcc. # "DIST" will be set to "windows", so we're currently overriding it with # a hardcoded value. -DIST="focal" +DIST="jammy" setup_pbuilder use_gcc DIST="$NORMAL_DISTRO" diff --git a/ceph-dev-new-build/build/build_mingw b/ceph-dev-new-build/build/build_mingw index b26c02553..086ba6902 100644 --- a/ceph-dev-new-build/build/build_mingw +++ b/ceph-dev-new-build/build/build_mingw @@ -1,10 +1,6 @@ #!/bin/bash set -ex -# We need Ubuntu Focal to cross-compile Ceph for Windows. -# Previous versions provide broken Mingw packages. -# "DIST" will be set to "windows", so we're currently overriding it with -# a hardcoded value. tmp_pbuild_script=$(mktemp /tmp/build_mingw_pbuild.XXXXXX) cat << EOF > $tmp_pbuild_script #!/bin/sh @@ -17,8 +13,8 @@ EOF chmod a+x $tmp_pbuild_script sudo pbuilder execute \ --bindmounts "$(pwd):/mnt/ceph" \ - --distribution "focal" \ - --basetgz $basedir/focal.tgz \ + --distribution "jammy" \ + --basetgz $basedir/jammy.tgz \ -- $tmp_pbuild_script rm $tmp_pbuild_script diff --git a/ceph-dev-new-build/build/setup_mingw b/ceph-dev-new-build/build/setup_mingw index 0b9441270..6a72d3b26 100644 --- a/ceph-dev-new-build/build/setup_mingw +++ b/ceph-dev-new-build/build/setup_mingw @@ -68,10 +68,10 @@ if [ "$THROWAWAY" = false ] ; then check_binary_existence $VENV $chacra_check_url fi -# We need Ubuntu Focal to cross-compile Ceph for Windows. -# Previous versions provide broken Mingw packages. +# We need Ubuntu >= Jammy to cross-compile Ceph for Windows. +# Previous versions provide broken Mingw packages/too old gcc. # "DIST" will be set to "windows", so we're currently overriding it with # a hardcoded value. -DIST="focal" +DIST="jammy" setup_pbuilder use_gcc DIST="$NORMAL_DISTRO" From 5fe40e08c40b13a568d7ba01663e86917140a101 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 31 Aug 2022 09:35:09 -0400 Subject: [PATCH 2/2] ceph-dev-build: sudo rm -rf dist Already doing this in the other build job: https://github.com/ceph/ceph-build/pull/1756 Signed-off-by: David Galloway --- ceph-dev-build/config/definitions/ceph-dev-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 31ee393c4..fffba24ac 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -73,7 +73,7 @@ builders: - shell: | echo "Cleaning up top-level workarea (shared among workspaces)" - rm -rf dist + sudo rm -rf dist rm -rf venv rm -rf release - copyartifact: