From bdbdecfcf258d3c0aa5326990854c4d1c99ee948 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Thu, 14 Oct 2021 10:56:41 +0200
Subject: [PATCH] Update CI deployment scripts

- Enable the use of Github access tokens to do the deployment.
- Introduce new PR tag `testlib` and a corresponding release note section.
- Remove release note section about regression test.
---
 ci-scripts/deploy.sh      | 11 ++++++++++-
 ci-scripts/genrelnotes.py |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ci-scripts/deploy.sh b/ci-scripts/deploy.sh
index 77fec73f50..0bedf45b21 100755
--- a/ci-scripts/deploy.sh
+++ b/ci-scripts/deploy.sh
@@ -5,6 +5,8 @@ oldpwd=$(pwd)
 usage()
 {
     echo "Usage: $0 VERSION"
+    echo "  Environment:"
+    echo "    - GH_DEPLOY_CREDENTIALS=<user>:<token>"
 }
 
 _onerror()
@@ -31,11 +33,18 @@ if [ $py_minor_version -lt 5 ]; then
     exit 1
 fi
 
+if [ -z "$GH_DEPLOY_CREDENTIALS" ]; then
+    _gh_creds_prefix=""
+else
+    _gh_creds_prefix="${GH_DEPLOY_CREDENTIALS}@"
+fi
+
+
 tmpdir=$(mktemp -d)
 echo "Deploying ReFrame version $version ..."
 echo "Working directory: $tmpdir ..."
 cd $tmpdir
-git clone https://github.com/eth-cscs/reframe.git
+git clone https://${_gh_creds_prefix}github.com/eth-cscs/reframe.git
 cd reframe
 ./bootstrap.sh
 found_version=$(./bin/reframe -V | sed -e 's/ (.*)//g')
diff --git a/ci-scripts/genrelnotes.py b/ci-scripts/genrelnotes.py
index 1bd9e0806f..2678c1334d 100755
--- a/ci-scripts/genrelnotes.py
+++ b/ci-scripts/genrelnotes.py
@@ -42,10 +42,10 @@ def extract_release_notes(git_output, tag):
     titles = {
         'feat': '## New features and enhancements',
         'bugfix': '## Bug fixes',
-        'test': '## Regression tests'
+        'testlib': '## Test library'
     }
     sections = collections.OrderedDict()
-    for tag in ['feat', 'bugfix', 'test', 'ci', 'doc']:
+    for tag in ['feat', 'bugfix', 'testlib', 'ci', 'doc']:
         title_line = titles.get(tag, '## Other')
         sections.setdefault(title_line, [])
         for pr, descr in extract_release_notes(completed.stdout, tag):