Merge "Improve repo rename functional testing"

playbooks/test-review.yaml

@@ -153,13 +153,13 @@
 
     - name: Create project project in Gerrit
       uri:
-        url: http://localhost:8081/a/projects/y%2Ftest-project
+        url: http://localhost:8081/a/projects/y%2Ftestproject
         method: PUT
         user: admin
         password: secret
         status_code: 201
 
-    - name: Create initial commit and change in test-project
+    - name: Create initial commit and change in testproject
       shell:
         executable: /bin/sh
         chdir: "{{ project_tmp.stdout }}"
@@ -171,11 +171,11 @@
           [gerrit]
           host=localhost
           port=29418
-          project=y/test-project
+          project=y/testproject
           EOF
           git add .gitreview
           git commit -m "Initial commit"
-          git remote add gerrit http://admin:secret@localhost:8081/y/test-project
+          git remote add gerrit http://admin:secret@localhost:8081/y/testproject
           git push -f --set-upstream gerrit +HEAD:master
 
           curl -Lo .git/hooks/commit-msg http://localhost:8081/tools/hooks/commit-msg

playbooks/zuul/test_gerrit_renames.yaml

@@ -1,5 +1,5 @@
 repos:
-  - old: y/test-project
+  - old: y/testproject
     new: x/test-project
 gerrit_groups:
   - old: CI-tools

playbooks/zuul/test_gitea_renames.yaml

@@ -1,6 +1,6 @@
 repos:
   - old: openstack/diskimage-builder
-    new: opendev/diskimage-builder
+    new: opendev/disk-image-builder
 gerrit_groups:
   - old: CI-tools
     new: CI-tools-updated

testinfra/test_gitea.py

@@ -66,7 +66,7 @@ def test_project_clone(host):
     # Note this tests the result of a project rename in gitea as well.
     cmd = host.run(
         'GIT_SSL_NO_VERIFY=1 '
-        'git clone https://localhost:3081/opendev/diskimage-builder '
-        '/tmp/diskimage-builder')
-    assert "Cloning into '/tmp/diskimage-builder'..." in cmd.stderr
+        'git clone https://localhost:3081/opendev/disk-image-builder '
+        '/tmp/disk-image-builder')
+    assert "Cloning into '/tmp/disk-image-builder'..." in cmd.stderr
     assert cmd.succeeded