From bf873a73cc3ee7e0fa5d7a1d2280fc3e3dd26ab0 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 17 Jan 2017 17:12:46 +0100 Subject: [PATCH] qa: update remaining ceph.com to download.ceph.com Fixes: http://tracker.ceph.com/issues/18574 Signed-off-by: John Spray (cherry picked from commit 549d993d3fd8ffffa280ed4a64aca41d1c6f2da1) Conflicts: qa/tasks/cram.py (trivial resolution) --- .../fs/multiclient/tasks/fsx-mpi.yaml.disabled | 2 +- .../fs/multiclient/tasks/ior-shared-file.yaml | 2 +- qa/suites/fs/multiclient/tasks/mdtest.yaml | 4 ++-- qa/tasks/cram.py | 8 ++++---- qa/tasks/qemu.py | 14 +++++++------- qa/workunits/suites/pjd.sh | 1 - 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled b/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled index e486c44c51e2..cd43309aa00f 100644 --- a/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled +++ b/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled @@ -6,7 +6,7 @@ tasks: - pexec: clients: - cd $TESTDIR - - wget http://ceph.com/qa/fsx-mpi.c + - wget http://download.ceph.com/qa/fsx-mpi.c - mpicc fsx-mpi.c -o fsx-mpi - rm fsx-mpi.c - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt diff --git a/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml b/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml index dcf24247a925..94501b2ae790 100644 --- a/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml +++ b/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml @@ -6,7 +6,7 @@ tasks: - pexec: clients: - cd $TESTDIR - - wget http://ceph.com/qa/ior.tbz2 + - wget http://download.ceph.com/qa/ior.tbz2 - tar xvfj ior.tbz2 - cd ior - ./configure diff --git a/qa/suites/fs/multiclient/tasks/mdtest.yaml b/qa/suites/fs/multiclient/tasks/mdtest.yaml index 1dd95d954fbb..fd337bd679e0 100644 --- a/qa/suites/fs/multiclient/tasks/mdtest.yaml +++ b/qa/suites/fs/multiclient/tasks/mdtest.yaml @@ -6,7 +6,7 @@ tasks: - pexec: clients: - cd $TESTDIR - - wget http://ceph.com/qa/mdtest-1.9.3.tgz + - wget http://download.ceph.com/qa/mdtest-1.9.3.tgz - mkdir mdtest-1.9.3 - cd mdtest-1.9.3 - tar xvfz $TESTDIR/mdtest-1.9.3.tgz @@ -20,4 +20,4 @@ tasks: all: - rm -f $TESTDIR/gmnt - rm -rf $TESTDIR/mdtest-1.9.3 - - rm -rf $TESTDIR/._mdtest-1.9.3 \ No newline at end of file + - rm -rf $TESTDIR/._mdtest-1.9.3 diff --git a/qa/tasks/cram.py b/qa/tasks/cram.py index 05138af4de03..1ef8ee784340 100644 --- a/qa/tasks/cram.py +++ b/qa/tasks/cram.py @@ -26,9 +26,9 @@ def task(ctx, config): - cram: clients: client.0: - - http://ceph.com/qa/test.t - - http://ceph.com/qa/test2.t] - client.1: [http://ceph.com/qa/test.t] + - http://download.ceph.com/qa/test.t + - http://download.ceph.com/qa/test2.t] + client.1: [http://download.ceph.com/qa/test.t] You can also run a list of cram tests on all clients:: @@ -36,7 +36,7 @@ def task(ctx, config): - ceph: - cram: clients: - all: [http://ceph.com/qa/test.t] + all: [http://download.ceph.com/qa/test.t] :param ctx: Context :param config: Configuration diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py index 5da8cfddb00c..c66049b84c75 100644 --- a/qa/tasks/qemu.py +++ b/qa/tasks/qemu.py @@ -378,9 +378,9 @@ def task(ctx, config): - ceph: - qemu: client.0: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh client.1: - test: http://ceph.com/qa/test2.sh + test: http://download.ceph.com/qa/test2.sh Or use the same settings on all clients: @@ -388,7 +388,7 @@ def task(ctx, config): - ceph: - qemu: all: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh For tests that don't need a filesystem, set type to block:: @@ -396,7 +396,7 @@ def task(ctx, config): - ceph: - qemu: client.0: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh type: block The test should be configured to run on /dev/vdb and later @@ -409,7 +409,7 @@ def task(ctx, config): - ceph: - qemu: client.0: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh type: block num_rbd: 2 @@ -419,7 +419,7 @@ def task(ctx, config): - ceph: - qemu: client.0: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh memory: 512 # megabytes If you want to run a test against a cloned rbd image, set clone to true:: @@ -428,7 +428,7 @@ def task(ctx, config): - ceph: - qemu: client.0: - test: http://ceph.com/qa/test.sh + test: http://download.ceph.com/qa/test.sh clone: true """ assert isinstance(config, dict), \ diff --git a/qa/workunits/suites/pjd.sh b/qa/workunits/suites/pjd.sh index 125ef4301377..e6df309ad5b8 100755 --- a/qa/workunits/suites/pjd.sh +++ b/qa/workunits/suites/pjd.sh @@ -2,7 +2,6 @@ set -e -#wget http://ceph.com/qa/pjd-fstest-20090130-RC-open24.tgz wget http://download.ceph.com/qa/pjd-fstest-20090130-RC-aclfixes.tgz tar zxvf pjd*.tgz cd pjd* -- 2.47.3