From b07c391994380cec67cf4ea19ed494088195c290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 8 Apr 2024 08:58:37 +0200 Subject: [PATCH] ansible,jenkins: rm centos7-release-sources host (#3490) Since v16 went EoL, RHEL8 is used for all release lines. --- ansible/inventory.yml | 1 - jenkins/scripts/VersionSelectorScript.groovy | 1 - jenkins/scripts/select-compiler.sh | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 44a89b726..188bd71c6 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -35,7 +35,6 @@ hosts: - release: - digitalocean: - centos7-x64-1: {ip: 138.68.12.105} rhel8-x64-1: {ip: 159.203.115.217} - ibm: diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 779dfef81..c62d5d489 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -79,7 +79,6 @@ def buildExclusions = [ [ /osx1015/, anyType, gte(21) ], // Source / headers / docs ------------------------------- - [ /^centos7-release-sources$/, releaseType, gte(18) ], [ /^rhel8-release-sources$/, releaseType, lt(18) ], // ------------------------------------------------------- diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index fd570f6ca..dbed409b0 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -187,16 +187,6 @@ elif [ "$SELECT_ARCH" = "X64" ]; then . /opt/rh/devtoolset-6/enable echo "Compiler set to devtoolset-6" ;; - centos7-release-sources ) - if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then - . /opt/rh/devtoolset-8/enable - else - . /opt/rh/devtoolset-6/enable - fi - export CC="ccache gcc" - export CXX="ccache g++" - echo "Compiler set to GCC" `$CXX -dumpversion` - ;; *ubuntu1804*64|*ubuntu1604-*64|benchmark ) if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then export CC="ccache gcc-8"