qa: switch to https protocol for repos' server

Since the git:// is not reachable any more and have switch to
https://.

The git archive does not support the https protocol, so we couldn't
user the git archive to retrieve the tar ball any more, will split
this into 3 steps:

1, clone the whole ceph repo
2, checkout the commit/tag/branch
3, then change directory to qa/workunits/.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
This commit is contained in:
Xiubo Li 2022-11-23 13:24:38 +08:00
parent f07b8a7984
commit 89177d6598
5 changed files with 18 additions and 18 deletions

View File

@ -17,4 +17,4 @@ shift
# rest of arguments passed directly to teuthology-suite
echo "Scheduling $branch branch"
teuthology-suite -v -c "$branch" -m "$machine" -k "$kernel" -s "$suite" --ceph-repo git://git.ceph.com/ceph.git --suite-repo git://git.ceph.com/ceph.git --subset "$((RANDOM % partitions))/$partitions" --newest 100 -e "$email" "$@"
teuthology-suite -v -c "$branch" -m "$machine" -k "$kernel" -s "$suite" --ceph-repo https://git.ceph.com/ceph.git --suite-repo https://git.ceph.com/ceph.git --subset "$((RANDOM % partitions))/$partitions" --newest 100 -e "$email" "$@"

View File

@ -33,7 +33,7 @@ PROGNAME=$(basename $0)
# xfstests is downloaded from this git repository and then built.
# XFSTESTS_REPO="git://oss.sgi.com/xfs/cmds/xfstests.git"
XFSTESTS_REPO="git://git.ceph.com/xfstests.git"
XFSTESTS_REPO="https://git.ceph.com/xfstests-dev.git"
# Default command line option values
COUNT="1"
@ -277,7 +277,7 @@ function install_xfstests() {
git clone "${XFSTESTS_REPO}"
cd xfstests
cd xfstests-dev
# FIXME: use an older version before the tests were rearranged!
git reset --hard e5f1a13792f20cfac097fef98007610b422f2cac
@ -296,7 +296,7 @@ function install_xfstests() {
function remove_xfstests() {
arg_count 0 $#
rm -rf "${TESTDIR}/xfstests"
rm -rf "${TESTDIR}/xfstests-dev"
rm -rf "${XFSTESTS_DIR}"
}

View File

@ -3,6 +3,7 @@ Daemon restart
"""
import logging
import pipes
import os
from teuthology import misc as teuthology
from teuthology.orchestra import run as tor
@ -48,17 +49,16 @@ def get_tests(ctx, config, role, remote, testdir):
'mkdir', '--', srcdir,
run.Raw('&&'),
'git',
'archive',
'--remote=git://git.ceph.com/ceph.git',
'%s:qa/workunits' % refspec,
run.Raw('|'),
'tar',
'-C', srcdir,
'-x',
'-f-',
'clone',
'https://git.ceph.com/ceph.git',
srcdir,
run.Raw('&&'),
'cd', '--', srcdir,
run.Raw('&&'),
'git', 'checkout', '-b', 'restart_test', str(refspec),
run.Raw('&&'),
'cd', '--', 'qa/workunits',
run.Raw('&&'),
'if', 'test', '-e', 'Makefile', run.Raw(';'), 'then', 'make', run.Raw(';'), 'fi',
run.Raw('&&'),
'find', '-executable', '-type', 'f', '-printf', r'%P\0',
@ -66,7 +66,7 @@ def get_tests(ctx, config, role, remote, testdir):
],
)
restarts = sorted(remote.read_file(f'{testdir}/restarts.list').decode().split('\0'))
return (srcdir, restarts)
return (os.path.join(srcdir, 'qa/workunits'), restarts)
def task(ctx, config):
"""

View File

@ -8,10 +8,10 @@ trap -- 'retry' EXIT
retry() {
rm -rf ceph
# double the timeout value
timeout 3600 git clone git://git.ceph.com/ceph.git
timeout 3600 git clone https://git.ceph.com/ceph.git
}
rm -rf ceph
timeout 1800 git clone git://git.ceph.com/ceph.git
timeout 1800 git clone https://git.ceph.com/ceph.git
trap - EXIT
cd ceph

View File

@ -2,12 +2,12 @@
set -e
git clone git://git.ceph.com/xfstests.git
cd xfstests
git clone https://git.ceph.com/xfstests-dev.git
cd xfstests-dev
git checkout 12973fc04fd10d4af086901e10ffa8e48866b735
make -j4
cd ..
cp xfstests/ltp/fsx .
cp xfstests-dev/ltp/fsx .
OPTIONS="-z" # don't use zero range calls; not supported by cephfs