commit fc6dbeebb430db3d46cd3b3b7082ec167d46b679
author Joan Touzet <wohali@users.noreply.github.com> Mon Jul 20 16:03:00 2020 +0000
committer GitHub <noreply@github.com> Mon Jul 20 12:03:00 2020 -0400
tree 43c43b6b4dc26494a398eb8773296dea98c36dec
parent ce22cbcc2c92de456f0a1d98c30d2ea17a3010c6

New cname for couchdb-vm2, see INFRA-20435 (#2982)

build-aux/Jenkinsfile.full

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index b3b477b..cc13f9d 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -727,12 +727,12 @@
           unstash 'tarball'
           unarchive mapping: ['pkgs/' : '.']
 
-          echo 'Retrieving & cleaning current couchdb-vm2 tree...'
+          echo 'Retrieving & cleaning current repo-nightly tree...'
           sh '''
-            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@couchdb-vm2.apache.org:/var/www/html/$BRANCH_NAME . || mkdir -p $BRANCH_NAME
+            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@repo-nightly.couchdb.org:/var/www/html/$BRANCH_NAME . || mkdir -p $BRANCH_NAME
             rm -rf $BRANCH_NAME/debian/* $BRANCH_NAME/el6/* $BRANCH_NAME/el7/* $BRANCH_NAME/el8/*
             mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el6 $BRANCH_NAME/el7 $BRANCH_NAME/el8 $BRANCH_NAME/source
-            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@couchdb-vm2.apache.org:/var/www/html/js .
+            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@repo-nightly.couchdb.org:/var/www/html/js .
           '''
 
           echo 'Building Debian repo...'
@@ -772,9 +772,9 @@
             cd ../..
           '''
 
-          echo 'rsyncing tree to couchdb-vm2...'
+          echo 'rsyncing tree to repo-nightly...'
           sh '''
-            rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no -i $KEY" $BRANCH_NAME jenkins@couchdb-vm2.apache.org:/var/www/html
+            rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no -i $KEY" $BRANCH_NAME jenkins@repo-nightly.couchdb.org:/var/www/html
             rm -rf $BRANCH_NAME couchdb-pkg *.tar.gz
           '''
         } // withCredentials

build-aux/logfile-uploader.py

diff --git a/build-aux/logfile-uploader.py b/build-aux/logfile-uploader.py
index 148704c..3df9e6c 100755
--- a/build-aux/logfile-uploader.py
+++ b/build-aux/logfile-uploader.py
@@ -22,7 +22,7 @@
 
 import requests
 
-COUCH_URL = "https://couchdb-vm2.apache.org/ci_errorlogs"
+COUCH_URL = "https://logs.couchdb.org/ci_errorlogs"
 TARFILE = "couchlog.tar.gz"