Use CentOS Stream 8 on Vespa 8

4 files changed, 26 insertions, 25 deletions

diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh
index c809504bef5..ca9ada81205 100755
--- a/screwdriver/build-vespa.sh
+++ b/screwdriver/build-vespa.sh
@@ -6,9 +6,7 @@ set -e
 readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )"
 readonly NUM_THREADS=$(( $(nproc) + 2 ))
 
-source /etc/profile.d/enable-devtoolset-11.sh
-source /etc/profile.d/enable-rh-maven35.sh
-source /etc/profile.d/enable-rh-git227.sh
+source /etc/profile.d/enable-gcc-toolset-11.sh
 
 export MALLOC_ARENA_MAX=1
 export MAVEN_OPTS="-Xss1m -Xms128m -Xmx2g"
@@ -54,21 +52,24 @@ case $SHOULD_BUILD in
     ;;    
 esac
 
-if [[ $SHOULD_BUILD == systemtest ]]; then  
-  yum -y --setopt=skip_missing_names_on_install=False install \
-    zstd \
-    devtoolset-11-gcc-c++ \
-    devtoolset-11-libatomic-devel \
-    devtoolset-11-binutils \
-    libxml2-devel \
-    rh-ruby27-rubygems-devel \
-    rh-ruby27-ruby-devel \
-    rh-ruby27 \
-    rh-ruby27-rubygem-net-telnet
-
-  source /opt/rh/rh-ruby27/enable
-  gem install libxml-ruby gnuplot distribution test-unit builder concurrent-ruby ffi
+if [[ $SHOULD_BUILD == systemtest ]]; then
+  dnf module enable -y ruby:2.7
+  dnf install -y \
+      gcc-toolset-11-annobin \
+      gcc-toolset-11-annobin-plugin-gcc \
+      gcc-toolset-11-binutils \
+      gcc-toolset-11-gcc-c++ \
+      gcc-toolset-11-libatomic-devel \
+      libxml2-devel \
+      ruby \
+      ruby-devel \
+      rubygems-devel \
+      rubygem-net-telnet \
+      zstd
 
+  source /opt/rh/gcc-toolset-11/enable
+  gem install libxml-ruby gnuplot distribution test-unit builder concurrent-ruby bigdecimal ffi parallel
+  
   cd $HOME
   git clone https://github.com/vespa-engine/system-test
   export SYSTEM_TEST_DIR=$(pwd)/system-test
diff --git a/screwdriver/delete-old-artifactory-artifacts.sh b/screwdriver/delete-old-artifactory-artifacts.sh
index 9235575baff..80cee37bd72 100755
--- a/screwdriver/delete-old-artifactory-artifacts.sh
+++ b/screwdriver/delete-old-artifactory-artifacts.sh
@@ -12,13 +12,13 @@ if [[ ! -f /etc/yum.repos.d/vespa.repo ]]; then
     cat << EOF > /etc/yum.repos.d/vespa.repo
 [vespa-release]
 name=Vespa releases
-baseurl=$ARTIFACTORY_URL/vespa/centos/7/release/\$basearch
+baseurl=$ARTIFACTORY_URL/vespa/centos/8/release/\$basearch
 gpgcheck=0
 enabled=1
 EOF
 fi
 
-VERSIONS_TO_DELETE=$(yum list --quiet --showduplicates --disablerepo='*' --enablerepo=vespa-release vespa | awk '/[0-9].*\.[0-9].*\.[0-9].*/{print $2}' | sort -V | head -n -200)
+VERSIONS_TO_DELETE=$(dnf list --quiet --showduplicates --disablerepo='*' --enablerepo=vespa-release vespa | awk '/[0-9].*\.[0-9].*\.[0-9].*/{print $2}' | sort -V | head -n -200)
 
 RPMS_TO_DELETE=$(mktemp)
 trap "rm -f $RPMS_TO_DELETE" EXIT
diff --git a/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh b/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
index dd0c953b424..3bcb4e101a5 100755
--- a/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
+++ b/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
@@ -13,7 +13,7 @@ if [[ ! -f /etc/yum.repos.d/group_vespa-vespa-epel-7.repo ]]; then
   cat << 'EOF' > /etc/yum.repos.d/group_vespa-vespa-epel-7.repo
 [copr:copr.fedorainfracloud.org:group_vespa:vespa]
 name=Copr repo for vespa owned by @vespa
-baseurl=https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-$basearch/
+baseurl=https://download.copr.fedorainfracloud.org/results/@vespa/vespa/centos-stream-8-$basearch/
 type=rpm-md
 gpgcheck=1
 gpgkey=https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/pubkey.gpg
@@ -27,7 +27,7 @@ if [[ ! -f /etc/yum.repos.d/vespa.repo ]]; then
   cat << 'EOF' > /etc/yum.repos.d/vespa.repo
 [vespa-release]
 name=Vespa releases
-baseurl=https://artifactory.yahooinc.com/artifactory/vespa/centos/7/release/$basearch
+baseurl=https://artifactory.yahooinc.com/artifactory/vespa/centos/8/release/$basearch
 gpgcheck=0
 enabled=1
 EOF
@@ -36,16 +36,16 @@ fi
 readonly COPR_PACKAGES=$(mktemp)
 trap "rm -f $COPR_PACKAGES" EXIT
 
-yum list -q --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa --showduplicates 'vespa*' | grep "Available Packages" -A 100000 | tail -n +2 | sed "s/\.x86_64\ */-/"| awk '{print $1}' > $COPR_PACKAGES
+dnf list -q --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa --showduplicates 'vespa*' | grep "Available Packages" -A 100000 | tail -n +2 | sed "s/\.x86_64\ */-/"| awk '{print $1}' > $COPR_PACKAGES
 
 echo "Packages on Copr:"
 cat $COPR_PACKAGES
 echo 
 
 for pv in $(cat $COPR_PACKAGES); do
-  if ! yum list -q --disablerepo='*' --enablerepo=vespa-release $pv &> /dev/null; then
+  if ! dnf list -q --disablerepo='*' --enablerepo=vespa-release $pv &> /dev/null; then
     echo "$pv not found on JFrog Clould. Downloading..."
-    yumdownloader -q $pv
+    dnf download -q $pv
     echo "$pv downloaded."
   fi
 done
diff --git a/screwdriver/upload-rpm-to-artifactory.sh b/screwdriver/upload-rpm-to-artifactory.sh
index 9482bc2dc6a..0c679debb48 100755
--- a/screwdriver/upload-rpm-to-artifactory.sh
+++ b/screwdriver/upload-rpm-to-artifactory.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 
 RPM=$1
 OS_DISTRO=centos
-RELEASEVER=7
+RELEASEVER=8
 MATURITY=release
 BASEARCH=x86_64