Skip to content

Commit

Permalink
qa: switch to https protocol for repos' server
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
lxbsz committed Dec 12, 2022
1 parent 1542f34 commit 1d8b179
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion qa/machine_types/schedule_subset.sh
Expand Up @@ -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" "$@"
2 changes: 1 addition & 1 deletion qa/run_xfstests-obsolete.sh
Expand Up @@ -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"
Expand Down
17 changes: 8 additions & 9 deletions qa/tasks/restart.py
Expand Up @@ -48,25 +48,24 @@ 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',
run.Raw('>{tdir}/restarts.list'.format(tdir=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):
"""
Expand Down
4 changes: 2 additions & 2 deletions qa/workunits/fs/snaps/snaptest-git-ceph.sh
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions qa/workunits/suites/fsx.sh
Expand Up @@ -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

Expand Down

0 comments on commit 1d8b179

Please sign in to comment.