This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/master by this push:
new fc6dbee New cname for couchdb-vm2, see INFRA-20435 (#2982)
fc6dbee is described below
commit fc6dbeebb430db3d46cd3b3b7082ec167d46b679
Author: Joan Touzet <[email protected]>
AuthorDate: Mon Jul 20 16:03:00 2020 +0000
New cname for couchdb-vm2, see INFRA-20435 (#2982)
---
build-aux/Jenkinsfile.full | 10 +++++-----
build-aux/logfile-uploader.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
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 @@ pipeline {
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"
[email protected]:/var/www/html/$BRANCH_NAME . || mkdir -p
$BRANCH_NAME
+ rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY"
[email protected]:/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"
[email protected]:/var/www/html/js .
+ rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY"
[email protected]:/var/www/html/js .
'''
echo 'Building Debian repo...'
@@ -772,9 +772,9 @@ pipeline {
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 [email protected]:/var/www/html
+ rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no -i $KEY"
$BRANCH_NAME [email protected]:/var/www/html
rm -rf $BRANCH_NAME couchdb-pkg *.tar.gz
'''
} // withCredentials
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 time
import requests
-COUCH_URL = "https://couchdb-vm2.apache.org/ci_errorlogs";
+COUCH_URL = "https://logs.couchdb.org/ci_errorlogs";
TARFILE = "couchlog.tar.gz"
