diff options
5 files changed, 15 insertions, 15 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 31eafe51ae2..6c3f68f6f74 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -50,11 +50,11 @@ BuildRequires: maven %define _java_home /usr/lib/jvm/java-11-amazon-corretto.%{?_arch} BuildRequires: python3-pytest %else -BuildRequires: devtoolset-10-gcc-c++ -BuildRequires: devtoolset-10-libatomic-devel -BuildRequires: devtoolset-10-binutils +BuildRequires: devtoolset-11-gcc-c++ +BuildRequires: devtoolset-11-libatomic-devel +BuildRequires: devtoolset-11-binutils BuildRequires: rh-maven35 -%define _devtoolset_enable /opt/rh/devtoolset-10/enable +%define _devtoolset_enable /opt/rh/devtoolset-11/enable %define _rhmaven35_enable /opt/rh/rh-maven35/enable BuildRequires: python36-pytest %endif @@ -69,10 +69,10 @@ BuildRequires: gcc-toolset-11-binutils BuildRequires: gcc-toolset-11-libatomic-devel %define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %else -BuildRequires: gcc-toolset-10-gcc-c++ -BuildRequires: gcc-toolset-10-binutils -BuildRequires: gcc-toolset-10-libatomic-devel -%define _devtoolset_enable /opt/rh/gcc-toolset-10/enable +BuildRequires: gcc-toolset-11-gcc-c++ +BuildRequires: gcc-toolset-11-binutils +BuildRequires: gcc-toolset-11-libatomic-devel +%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %endif BuildRequires: maven BuildRequires: pybind11-devel diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java index a29f6a89283..45dbfd07209 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java @@ -29,7 +29,7 @@ public class CoreCollector { private static final Pattern CORE_GENERATOR_PATH_PATTERN = Pattern.compile("^Core was generated by `(?<path>.*?)'.$"); private static final Pattern EXECFN_PATH_PATTERN = Pattern.compile("^.* execfn: '(?<path>.*?)'"); private static final Pattern FROM_PATH_PATTERN = Pattern.compile("^.* from '(?<path>.*?)'"); - static final String GDB_PATH_RHEL8 = "/opt/rh/gcc-toolset-10/root/bin/gdb"; + static final String GDB_PATH_RHEL8 = "/opt/rh/gcc-toolset-11/root/bin/gdb"; static final Map<String, Object> JAVA_HEAP_DUMP_METADATA = Map.of("bin_path", "java", "backtrace", List.of("Heap dump, no backtrace available")); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java index b4ff7a0ceae..5c334837040 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java @@ -86,7 +86,7 @@ public class CoreCollectorTest { fail("Expected not to be able to get bin path"); } catch (RuntimeException e) { assertEquals("Failed to extract binary path from GDB, result: exit status 1, output 'Error 123', command: " + - "[/bin/sh, -c, /opt/rh/gcc-toolset-10/root/bin/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by']", e.getMessage()); + "[/bin/sh, -c, /opt/rh/gcc-toolset-11/root/bin/gdb -n -batch -core /tmp/core.1234 | grep '^Core was generated by']", e.getMessage()); } } diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index f321e3820fd..886144b1c12 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -6,7 +6,7 @@ set -e readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )" readonly NUM_THREADS=$(( $(nproc) + 2 )) -source /etc/profile.d/enable-devtoolset-10.sh +source /etc/profile.d/enable-devtoolset-11.sh source /etc/profile.d/enable-rh-maven35.sh source /etc/profile.d/enable-rh-git227.sh @@ -57,9 +57,9 @@ esac if [[ $SHOULD_BUILD == systemtest ]]; then yum -y --setopt=skip_missing_names_on_install=False install \ zstd \ - devtoolset-10-gcc-c++ \ - devtoolset-10-libatomic-devel \ - devtoolset-10-binutils \ + devtoolset-11-gcc-c++ \ + devtoolset-11-libatomic-devel \ + devtoolset-11-binutils \ libxml2-devel \ rh-ruby27-rubygems-devel \ rh-ruby27-ruby-devel \ diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index f75ffdbd13f..d2677e58a00 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -123,7 +123,7 @@ export LD_LIBRARY_PATH=$VESPA_HOME/lib64 export MALLOC_ARENA_MAX=1 # Prefer newer gdb and pstack -prepend_path /opt/rh/gcc-toolset-10/root/usr/bin +prepend_path /opt/rh/gcc-toolset-11/root/usr/bin # Maven is needed for tester applications prepend_path "$VESPA_HOME/local/maven/bin" |