qa/tasks/cram: use suite_repo repository for all cram jobs

Currently git.ceph.com is hardcoded for all cram jobs.  Testing
modifications is a pain: one needs to push to either ceph/ceph.git or
ceph/ceph-ci.git (depending on where the ceph branch is at, triggering
unnecessary builds in the latter case) and wait for the mirror to sync.
Runs scheduled against branches in developer's forks fail.

Move away from git.ceph.com to allow mixing branches and repositories,
similar to workunits.

Fixes: https://tracker.ceph.com/issues/27211
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/qa/suites/krbd/basic/tasks/krbd_blkroset.yaml b/qa/suites/krbd/basic/tasks/krbd_blkroset.yaml
index 6251c22731caa32c6cb638cba779f5d72a5b8b1e..3b401c1a34c5fa7f4f3390971e58c30f1eb72562 100644 (file)
--- a/qa/suites/krbd/basic/tasks/krbd_blkroset.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_blkroset.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/rbd/krbd_blkroset.t
+      - '{gh_url}/raw/{branch}/qa/rbd/krbd_blkroset.t'

diff --git a/qa/suites/krbd/basic/tasks/krbd_huge_image.yaml b/qa/suites/krbd/basic/tasks/krbd_huge_image.yaml
index 5fe7af04449b010408863debaa5c18b6949ccfa5..93dbdc1d712050f6fd390f18d10afe10aae2b440 100644 (file)
--- a/qa/suites/krbd/basic/tasks/krbd_huge_image.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_huge_image.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/rbd/krbd_huge_image.t
+      - '{gh_url}/raw/{branch}/qa/rbd/krbd_huge_image.t'

diff --git a/qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml b/qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml
index ee5dc6dc2963ea86861a63534149c99277793d41..77f8dc282785d428da41bd1f7b2f2bd3d016c9dc 100644 (file)
--- a/qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/rbd/krbd_msgr_segments.t
+      - '{gh_url}/raw/{branch}/qa/rbd/krbd_msgr_segments.t'

diff --git a/qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml b/qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml
index c7d38572691add4a0f7d561d8fb0520acb41c0f5..eccfca4042abc3e109445b4980c7e69a9a75494d 100644 (file)
--- a/qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/rbd/krbd_parent_overlap.t
+      - '{gh_url}/raw/{branch}/qa/rbd/krbd_parent_overlap.t'

diff --git a/qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml b/qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml
index 878c33f33cdac55f25a2c9a3ac508a142ae51978..7594589a5524a0a90b85b529e68fff4d66baef2c 100644 (file)
--- a/qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/rbd/krbd_whole_object_discard.t
+      - '{gh_url}/raw/{branch}/qa/rbd/krbd_whole_object_discard.t'

diff --git a/qa/suites/krbd/unmap/tasks/unmap.yaml b/qa/suites/krbd/unmap/tasks/unmap.yaml
index 05cc5f3ae6be7498c0eef7a816d426a6c2d45312..47153cf4d36ffef8a670b640422a64092e749791 100644 (file)
--- a/qa/suites/krbd/unmap/tasks/unmap.yaml
+++ b/qa/suites/krbd/unmap/tasks/unmap.yaml
@@ -2,4 +2,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=src/test/cli-integration/rbd/unmap.t
+      - '{gh_url}/raw/{branch}/src/test/cli-integration/rbd/unmap.t'

diff --git a/qa/suites/rbd/singleton/all/formatted-output.yaml b/qa/suites/rbd/singleton/all/formatted-output.yaml
index f6a19910c12b18ac72b02369031c9c5bba4a5494..df1112d4e32af5699a5ea0614e0cfbada123556e 100644 (file)
--- a/qa/suites/rbd/singleton/all/formatted-output.yaml
+++ b/qa/suites/rbd/singleton/all/formatted-output.yaml
@@ -7,4 +7,4 @@ tasks:
 - cram:
     clients:
       client.0:
-      - http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=src/test/cli-integration/rbd/formatted-output.t
+      - '{gh_url}/raw/{branch}/src/test/cli-integration/rbd/formatted-output.t'

diff --git a/qa/tasks/cram.py b/qa/tasks/cram.py
index 7184745782b1afb5fa91d94eb47982cd6879e7f3..edcb1722671734b233b687ddf52e1e06d48a29e4 100644 (file)
--- a/qa/tasks/cram.py
+++ b/qa/tasks/cram.py
@@ -62,11 +62,9 @@ def task(ctx, config):
     if refspec is None:
         refspec = 'HEAD'
 
-    # hack: the git_url is always ceph-ci or ceph
-    git_url = teuth_config.get_ceph_git_url()
-    repo_name = 'ceph.git'
-    if git_url.count('ceph-ci'):
-        repo_name = 'ceph-ci.git'
+    git_url = teuth_config.get_ceph_qa_suite_git_url()
+    if git_url.endswith('.git'):
+        git_url = git_url[:-4]
 
     try:
         for client, tests in clients.iteritems():
@@ -83,7 +81,7 @@ def task(ctx, config):
                     ],
                 )
             for test in tests:
-                url = test.format(repo=repo_name, branch=refspec)
+                url = test.format(gh_url=git_url, branch=refspec)
                 log.info('fetching test %s for %s', url, client)
                 assert test.endswith('.t'), 'tests must end in .t'
                 remote.run(