Merge pull request ceph#6287 from jcsp/wip-test-fixes

git path backports for hammer
bmb · Oct 15, 2015 · 5764e23 · 5764e23
2 parents 7f485ed + b203979
commit 5764e23
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/qa/run_xfstests-obsolete.sh b/qa/run_xfstests-obsolete.sh
@@ -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://ceph.com/git/xfstests.git"
+XFSTESTS_REPO="git://git.ceph.com/xfstests.git"
 
 # Default command line option values
 COUNT="1"

diff --git a/qa/workunits/hadoop/wordcount.sh b/qa/workunits/hadoop/wordcount.sh
@@ -19,7 +19,7 @@ echo "starting hadoop-wordcount test"
 $HADOOP_PREFIX/bin/hadoop fs -rm -r $WC_INPUT $WC_OUTPUT || true
 
 # Fetch and import testing data set
-curl http://ceph.com/qa/hadoop_input_files.tar | tar xf - -C $DATA_INPUT
+curl http://download.ceph.com/qa/hadoop_input_files.tar | tar xf - -C $DATA_INPUT
 $HADOOP_PREFIX/bin/hadoop fs -copyFromLocal $DATA_INPUT $WC_INPUT
 rm -rf $DATA_INPUT
 

diff --git a/qa/workunits/kernel_untar_build.sh b/qa/workunits/kernel_untar_build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-wget -q http://ceph.com/qa/linux-4.0.5.tar.xz
+wget -q http://download.ceph.com/qa/linux-4.0.5.tar.xz
 
 mkdir t
 cd t

diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh
@@ -31,7 +31,7 @@ then
     cd ..
     testlist=$testlist' 032 033 055 077'
 else
-    git clone git://ceph.com/git/qemu-iotests.git
+    git clone git://git.ceph.com/qemu-iotests.git
 fi
 
 cd "$iotests"

diff --git a/qa/workunits/rbd/run_cli_tests.sh b/qa/workunits/rbd/run_cli_tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 
-wget -q http://ceph.com/qa/rbd_cli_tests.pls
-wget -q http://ceph.com/qa/RbdLib.pm
+wget -q http://download.ceph.com/qa/rbd_cli_tests.pls
+wget -q http://download.ceph.com/qa/RbdLib.pm
 perl rbd_cli_tests.pls --pool test
 exit 0
 
diff --git a/qa/workunits/snaps/snap-rm-diff.sh b/qa/workunits/snaps/snap-rm-diff.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -ex
 
 ceph mds set allow_new_snaps true --yes-i-really-mean-it
-wget -q http://ceph.com/qa/linux-2.6.33.tar.bz2
+wget -q http://download.ceph.com/qa/linux-2.6.33.tar.bz2
 mkdir foo
 cp linux* foo
 mkdir foo/.snap/barsnap

diff --git a/qa/workunits/snaps/snaptest-git-ceph.sh b/qa/workunits/snaps/snaptest-git-ceph.sh
@@ -4,7 +4,7 @@ set -e
 
 ceph mds set allow_new_snaps true --yes-i-really-mean-it
 
-git clone git://ceph.com/git/ceph.git
+git clone git://git.ceph.com/ceph.git
 cd ceph
 
 versions=`seq 1 21`

diff --git a/qa/workunits/snaps/snaptest-snap-rm-cmp.sh b/qa/workunits/snaps/snaptest-snap-rm-cmp.sh
@@ -5,7 +5,7 @@ set -e
 ceph mds set allow_new_snaps true --yes-i-really-mean-it
 
 file=linux-2.6.33.tar.bz2
-wget -q http://ceph.com/qa/$file
+wget -q http://download.ceph.com/qa/$file
 
 real=`md5sum $file | awk '{print $1}'`
 
@@ -23,4 +23,4 @@ do
     fi
     rmdir .snap/s
 done
-rm $file
+rm $file
diff --git a/qa/workunits/snaps/untar_snap_rm.sh b/qa/workunits/snaps/untar_snap_rm.sh
@@ -5,7 +5,7 @@ set -e
 ceph mds set allow_new_snaps true --yes-i-really-mean-it
 
 do_tarball() {
-    wget http://ceph.com/qa/$1
+    wget http://download.ceph.com/qa/$1
     tar xvf$2 $1
     mkdir .snap/k
     sync

diff --git a/qa/workunits/suites/blogbench.sh b/qa/workunits/suites/blogbench.sh
@@ -2,7 +2,7 @@
 set -e
 
 echo "getting blogbench"
-wget http://ceph.com/qa/blogbench-1.0.tar.bz2
+wget http://download.ceph.com/qa/blogbench-1.0.tar.bz2
 #cp /home/gregf/src/blogbench-1.0.tar.bz2 .
 tar -xvf blogbench-1.0.tar.bz2
 cd blogbench*
@@ -12,4 +12,4 @@ make
 cd src
 mkdir blogtest_in
 echo "running blogbench"
-./blogbench -d blogtest_in
+./blogbench -d blogtest_in
diff --git a/qa/workunits/suites/ffsb.sh b/qa/workunits/suites/ffsb.sh
@@ -4,7 +4,7 @@ set -e
 
 mydir=`dirname $0`
 
-wget http://ceph.com/qa/ffsb.tar.bz2
+wget http://download.ceph.com/qa/ffsb.tar.bz2
 tar jxvf ffsb.tar.bz2
 cd ffsb-*
 ./configure

diff --git a/qa/workunits/suites/fsstress.sh b/qa/workunits/suites/fsstress.sh
@@ -5,7 +5,7 @@ then
     path=`pwd`
     mkdir -p /tmp/fsstress
     cd /tmp/fsstress
-    wget -q -O /tmp/fsstress/ltp-full.tgz http://ceph.com/qa/ltp-full-20091231.tgz
+    wget -q -O /tmp/fsstress/ltp-full.tgz http://download.ceph.com/qa/ltp-full-20091231.tgz
     tar xzf /tmp/fsstress/ltp-full.tgz
     rm /tmp/fsstress/ltp-full.tgz
     cd /tmp/fsstress/ltp-full-20091231/testcases/kernel/fs/fsstress

diff --git a/qa/workunits/suites/fsx.sh b/qa/workunits/suites/fsx.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-git clone git://ceph.com/git/xfstests.git
+git clone git://git.ceph.com/xfstests.git
 make -C xfstests
 cp xfstests/ltp/fsx .
 

diff --git a/qa/workunits/suites/fsync-tester.sh b/qa/workunits/suites/fsync-tester.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-wget http://ceph.com/qa/fsync-tester.c
+wget http://download.ceph.com/qa/fsync-tester.c
 gcc fsync-tester.c -o fsync-tester
 
 ./fsync-tester

diff --git a/qa/workunits/suites/iogen.sh b/qa/workunits/suites/iogen.sh
@@ -2,7 +2,7 @@
 set -e
 
 echo "getting iogen"
-wget http://ceph.com/qa/iogen_3.1p0.tar
+wget http://download.ceph.com/qa/iogen_3.1p0.tar
 tar -xvzf iogen_3.1p0.tar
 cd iogen*
 echo "making iogen"

diff --git a/qa/workunits/suites/pjd.sh b/qa/workunits/suites/pjd.sh
@@ -3,7 +3,7 @@
 set -e
 
 #wget http://ceph.com/qa/pjd-fstest-20090130-RC-open24.tgz
-wget http://ceph.com/qa/pjd-fstest-20090130-RC-aclfixes.tgz
+wget http://download.ceph.com/qa/pjd-fstest-20090130-RC-aclfixes.tgz
 tar zxvf pjd*.tgz
 cd pjd*
 make
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
-    wget -q http://ceph.com/qa/linux-4.0.5.tar.xz
+    wget -q http://download.ceph.com/qa/linux-4.0.5.tar.xz
     mkdir t
     cd t
@@ Expand Down @@