Edit interop repo links and source in guidelines

interop repository has been moved from openstack/ namespace to osf/ one and now it's moved to openinfra/ by [1]. This commit fixes the links pointing to interop repository so that they point to the current source. We also reorganized the guidelines recently by [2] and moved them to a specific directory. This commit fixes the links within the guidelines so that they point to the current guideline location. [1] https://review.opendev.org/c/openstack/project-config/+/808479 [2] https://review.opendev.org/c/osf/interop/+/796413 Depends-On: https://review.opendev.org/c/openinfra/ansible-role-refstack-client/+/814383 Change-Id: I3193252181758bde9da6c4c69f927055b64f902d
2021-10-08 13:47:12 +02:00 · 2021-10-08 13:47:12 +02:00 · 4b0c80a4ef
parent 1ffecc32f8
commit 4b0c80a4ef
56 changed files with 321 additions and 127 deletions
--- a/HACKING.rst
+++ b/HACKING.rst
@ -118,7 +118,7 @@ To file a flag request for a test, follow these steps:

   .. code-block:: console

-      $ git clone https://opendev.org/openstack/interop.git
+      $ git clone https://opendev.org/openinfra/interop.git

 #. Open the relevant Guideline or Guidelines in your favorite text
   editor and locate the tests you want to flag.
--- a/add-ons/dns_current_guideline
+++ b/add-ons/dns_current_guideline
@ -1 +0,0 @@
-guidelines/dns.2020.11.json
--- a/add-ons/dns_current_guideline
+++ b/add-ons/dns_current_guideline
@ -0,0 +1,195 @@
+{
+  "metadata": {
+    "id": "dns.2020.11",
+    "schema": "2.0",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2020.11.json",
+    "scoring": {
+      "cutoff_score": 60,
+      "criteria": {
+       "atomic": {
+          "name": "Atomic",
+          "description": "The capabilities are unique and cannot be built out of other must-pass capabilities.",
+          "weight": 6
+        },
+        "clients": {
+          "name": "Used By Clients",
+          "description": "The capabilities are widely used by common OpenStack clients, including the openstack client, nova client, neutron client, and so on. This criterion pertains mostly to API versioning. For example, if v2 of a given API is not used by other OpenStack clients but v1 is, then v2 doesn't achieve the 'used by clients' criterion.",
+          "weight": 10
+        },
+        "complete": {
+          "name": "Complete",
+          "description": "Where the code being tested has a designated area of alternate implementation (add-on framework) as per the Core Principles, there should be parity in capability tested across add-on implementations. This also implies that the capability test is not configuration specific or locked to non-open technology.",
+          "weight": 8
+        },
+        "discover": {
+          "name": "Discoverable",
+          "description": "Capability being tested is Service Discoverable (can be found in Keystone and via service introspection).",
+          "weight": 8
+        },
+        "doc": {
+          "name": "Documented",
+          "description": "The capability is well documented, including both the interface and the expected behavior.",
+          "weight": 8
+        },
+        "future": {
+          "name": "Future Direction",
+          "description": "The capability reflects the future technical direction as defined by theproject technical teams and the Technical Committee.",
+          "weight": 11
+        },
+        "stable": {
+          "name": "Stable",
+          "description": "A capability that whose API has changed in more than two releases. Meant to select for capabilities that are stable and not under active development.",
+          "weight": 9
+        },
+        "sticky": {
+          "name": "Core In Last Release",
+          "description": "A capability whose API was present in the previous guideline release. Discourages the disruption of replacing the API a capability uses, or removing a capability from core.",
+          "weight": 9
+        },
+        "tools": {
+          "name": "Used By Tools",
+          "description": "Capabilities that are widely used outside of the OpenStack client ecosystem. Example tools include GopherCloud, jClouds, Fog, and so on.",
+          "weight": 6
+        }
+      }
+    },
+    "os_trademark_approval": {
+      "target_approval": "dns.2020.11",
+      "replaces": "dns.2020.06",
+      "releases": ["train", "ussuri","victoria", "wallaby"],
+      "status": "approved"
+    }
+  },
+  "add-ons": {
+    "DNS": {
+      "description": "OpenStack Powered with DNS",
+      "components": [
+        { "name": "os_powered_dns" }
+      ],
+      "required_platform_components": [
+        {
+          "name": "os_powered_compute",
+          "source": "https://opendev.org/openinfra/interop/src/branch/master/guidelines/2020.11.json"
+        }
+      ]
+    }
+  },
+  "components": {
+    "os_powered_dns": {
+      "capabilities": {
+        "required": [
+            "dns-record-crud",
+            "dns-zone-crud"
+        ],
+        "advisory": [
+        ],
+        "deprecated": [
+        ],
+        "removed": [
+        ]
+      },
+      "designated_sections": {
+        "required": [
+          "designate"
+        ]
+      }
+    }
+  },
+  "capabilities": {
+    "dns-record-crud": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Operations to create, update, and delete dns records.",
+      "project": "designate",
+      "required_since": "2018.02",
+      "tests": {
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_create_all_recordset_types": {
+          "idempotent_id": "id-d03b69a5-5052-43bc-a38a-b511b6b34304",
+          "flagged": {
+            "date": "2021-09-09",
+            "reason": "[D401] The test represents series of tests. Each test from the series should have its own id. Skipped until this bug is resolved: https://bugs.launchpad.net/designate/+bug/1943115"
+          }
+        },
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_delete_recordset": {
+          "idempotent_id": "id-855399c1-8806-4ae5-aa31-cb8a6f35e218"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_list_recordsets": {
+          "idempotent_id": "id-5964f730-5546-46e6-9105-5030e9c492b2"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_show_recordsets": {
+          "idempotent_id": "id-84c13cb2-9020-4c1e-aeb0-c348d9a70caa"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_update_recordset": {
+          "idempotent_id": "id-8d41c85f-09f9-48be-a202-92d1bdf5c796"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_update_recordset_one_field": {
+          "idempotent_id": "id-60904cc5-148b-4e3b-a0c6-35656dc8d44c"
+        }
+      }
+    },
+    "dns-zone-crud": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Operations to create, update, and delete zones.",
+      "project": "designate",
+      "required_since": "2018.02",
+      "tests": {
+        "designate_tempest_plugin.tests.scenario.v2.test_zones.ZonesTest.test_create_and_delete_zone": {
+          "idempotent_id": "id-d0648f53-4114-45bd-8792-462a82f69d32"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_zones.ZonesTest.test_show_zone": {
+          "idempotent_id": "id-02ca5d6a-86ce-4f02-9d94-9e5db55c3055"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_zones.ZonesTest.test_list_zones": {
+          "idempotent_id": "id-5bfa3cfe-5bc8-443b-bf48-cfba44cbb247"
+        },
+        "designate_tempest_plugin.tests.api.v2.test_zones.ZonesTest.test_update_zone": {
+          "idempotent_id": "id-123f51cb-19d5-48a9-aacc-476742c02141"
+        }
+      }
+    }
+  },
+  "designated_sections": {
+    "designate": {
+      "required": {
+        "guidance": "API and Central code, allowing for plugins and excluding storage and scheduler filters",
+        "sections": {
+          "api": {
+            "description": "The designate API, allowing for plugins",
+            "designated": true
+          },
+          "central": {
+            "description": "Designate central code, excluding storage and scheduler filters",
+            "designated": true
+          }
+        }
+      }
+    }
+  },
+  "test_repositories": {
+    "designate-tempest-plugin": {
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
+      "reference": "5da3047851aae36f09e0b52f79523426fec6a104",
+      "description": "OpenStack Designate Test Plugin Repository"
+    }
+  }
+}
--- a/add-ons/guidelines/dns.2018.02.json
+++ b/add-ons/guidelines/dns.2018.02.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2018.02",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.next.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -69,7 +69,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2018.02.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.02.json"
        }
      ]
    }
@ -184,7 +184,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.2018.11.json
+++ b/add-ons/guidelines/dns.2018.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2018.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.2018.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2018.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -69,7 +69,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2018.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.11.json"
        }
      ]
    }
@ -186,7 +186,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.2019.06.json
+++ b/add-ons/guidelines/dns.2019.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2019.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.2019.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2019.06.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2019.06.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.06.json"
        }
      ]
    }
@ -187,7 +187,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.2019.11.json
+++ b/add-ons/guidelines/dns.2019.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2019.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.2019.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2019.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2019.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.11.json"
        }
      ]
    }
@ -187,7 +187,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.2020.06.json
+++ b/add-ons/guidelines/dns.2020.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2020.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.2020.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2020.06.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2020.06.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.06.json"
        }
      ]
    }
@ -187,7 +187,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.2020.11.json
+++ b/add-ons/guidelines/dns.2020.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.2020.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/dns.2020.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.2020.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/2020.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.11.json"
        }
      ]
    }
@ -187,7 +187,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "5da3047851aae36f09e0b52f79523426fec6a104",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/dns.next.json
+++ b/add-ons/guidelines/dns.next.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "dns.next",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/dns.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/dns.next.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/next.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json"
        }
      ]
    }
@ -187,7 +187,7 @@
  },
  "test_repositories": {
    "designate-tempest-plugin": {
-      "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/designate-tempest-plugin/",
      "reference": "5da3047851aae36f09e0b52f79523426fec6a104",
      "description": "OpenStack Designate Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2018.02.json
+++ b/add-ons/guidelines/orchestration.2018.02.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.next",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/orchestration.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.next.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -69,7 +69,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2018.02.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.02.json"
        }
      ]
    }
@ -711,7 +711,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2018.11.json
+++ b/add-ons/guidelines/orchestration.2018.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.2018.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/orchestration.2018.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.2018.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2018.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.11.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2019.06.json
+++ b/add-ons/guidelines/orchestration.2019.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.2019.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/orchestration.2019.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.2019.06.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2019.06.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.06.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2019.11.json
+++ b/add-ons/guidelines/orchestration.2019.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.2019.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/orchestration.2019.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.2019.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2019.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.11.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2020.06.json
+++ b/add-ons/guidelines/orchestration.2020.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.2020.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/orchestration.2020.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.2020.06.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/2020.06.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.06.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "master",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.2020.11.json
+++ b/add-ons/guidelines/orchestration.2020.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.2020.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/orchestration.2020.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.2020.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/2020.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.11.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "fa9f6ccd34c106bcaa50cb2f13caea2c387a6b5f",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/orchestration.next.json
+++ b/add-ons/guidelines/orchestration.next.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "orchestration.next",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/orchestration.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/orchestration.next.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -70,7 +70,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/next.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json"
        }
      ]
    }
@ -734,7 +734,7 @@
  },
  "test_repositories": {
    "heat": {
-      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
      "reference": "fa9f6ccd34c106bcaa50cb2f13caea2c387a6b5f",
      "description": "OpenStack Heat Tempest Test Plugin Repository"
    }
--- a/add-ons/guidelines/shared_file_system.2020.11.json
+++ b/add-ons/guidelines/shared_file_system.2020.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "shared_file_system.2020.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/shared_file_system.2020.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/shared_file_system.2020.11.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -71,7 +71,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/2020.11.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.11.json"
        }
      ]
    }
--- a/add-ons/guidelines/shared_file_system.next.json
+++ b/add-ons/guidelines/shared_file_system.next.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "shared_file_system.next",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/shared_file_system.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/add-ons/guidelines/shared_file_system.next.json",
    "scoring": {
      "cutoff_score": 60,
      "criteria": {
@ -72,7 +72,7 @@
      "required_platform_components": [
        {
          "name": "os_powered_compute",
-          "source": "http://opendev.org/osf/interop/next.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json"
        }
      ]
    }
--- a/doc/source/guidelines/2015.03.rst
+++ b/doc/source/guidelines/2015.03.rst
@ -4,7 +4,7 @@ OpenStack DefCore 2015.03

 :Status: superseded
 :Replaces: 2014.07
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2015.03.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2015.03.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2015.04.rst
+++ b/doc/source/guidelines/2015.04.rst
@ -4,7 +4,7 @@ OpenStack DefCore 2015.04

 :Status: superseded
 :Replaces: 2015.03
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2015.04.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2015.04.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2015.05.rst
+++ b/doc/source/guidelines/2015.05.rst
@ -4,7 +4,7 @@ OpenStack DefCore 2015.05

 :Status: superseded
 :Replaces: 2015.04
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2015.05.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2015.05.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2015.07.rst
+++ b/doc/source/guidelines/2015.07.rst
@ -4,7 +4,7 @@ OpenStack DefCore 2015.07

 :Status: superseded
 :Replaces: 2015.05
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2015.07.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2015.07.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2016.01.rst
+++ b/doc/source/guidelines/2016.01.rst
@ -4,7 +4,7 @@ OpenStack DefCore 2016.01

 :Status: superseded
 :Replaces: 2015.07
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2016.01.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2016.01.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2016.08.rst
+++ b/doc/source/guidelines/2016.08.rst
@ -4,7 +4,7 @@ OpenStack Interoperability Guideline 2016.08

 :Status: superseded
 :Replaces: 2016.01
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2016.08.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2016.08.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2017.01.rst
+++ b/doc/source/guidelines/2017.01.rst
@ -4,7 +4,7 @@ OpenStack Interoperability Guideline 2017.01

 :Status: superseded
 :Replaces: 2016.08
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2017.01.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2017.01.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2017.09.rst
+++ b/doc/source/guidelines/2017.09.rst
@ -4,7 +4,7 @@ OpenStack Interoperability Guideline 2017.09

 :Status: approved
 :Replaces: 2017.01
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/2017.09.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2017.09.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/2018.02.rst
+++ b/doc/source/guidelines/2018.02.rst
@ -4,7 +4,7 @@ OpenStack Interoperability Guideline next

 :Status: approved
 :Replaces: 2017.09
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/next.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/guidelines/next.rst
+++ b/doc/source/guidelines/next.rst
@ -4,7 +4,7 @@ OpenStack Interoperability Guideline next

 :Status: draft
 :Replaces: 2017.01
-:JSON Master: http://opendev.org/openstack/interop/raw/branch/master/next.json
+:JSON Master: https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json

 This document outlines the mandatory capabilities and designated
 sections required to exist in a software installation in order to
--- a/doc/source/periodic_reports/fall_2016.rst
+++ b/doc/source/periodic_reports/fall_2016.rst
@ -77,16 +77,16 @@ for products labeled "OpenStack."  For more information about the DefCore
 Committee, please refer to the following resources:

 * The `Core Definition
-  <http://opendev.org/openstack/interop/raw/branch/master/doc/source/process/CoreDefinition.rst>`_
+  <http://opendev.org/openinfra/interop/raw/branch/master/doc/source/process/CoreDefinition.rst>`_
  document describes the DefCore Committee's guiding principals.
 * The `2016A Process document
-  <http://opendev.org/openstack/interop/raw/branch/master/doc/source/process/2016A.rst>`_
+  <http://opendev.org/openinfra/interop/raw/branch/master/doc/source/process/2016A.rst>`_
  describes some of the DefCore Committee's operating procedures.
 * The `Core Criteria document
-  <http://opendev.org/openstack/interop/raw/branch/master/doc/source/process/CoreCriteria.rst>`_
+  <http://opendev.org/openinfra/interop/raw/branch/master/doc/source/process/CoreCriteria.rst>`_
  describes the criteria the DefCore Committee uses to evaluate Capabilities
  for inclusion in its Interoperability Guidelines.
-* The `DefCore Lexicon <http://opendev.org/openstack/interop/raw/branch/master/doc/source/process/Lexicon.rst>`_
+* The `DefCore Lexicon <http://opendev.org/openinfra/interop/raw/branch/master/doc/source/process/Lexicon.rst>`_
  defines some of the terminology the DefCore Committee uses, including some
  terms that are used in this report.
 * The `OpenStack Interoperability page
@ -165,7 +165,7 @@ The DefCore Committee recognizes that using existing tests for a new purpose
 may sometimes require tests to be refined or even for new tests to be written.
 In order for good interoperability tests to be developed, the DefCore
 Committee has `created a specification
-<http://opendev.org/openstack/interop/raw/branch/master/working_materials/DefCoreSpec.rst>`_
+<http://opendev.org/openinfra/interop/raw/branch/master/working_materials/DefCoreSpec.rst>`_
 that discusses what traits we look for in a test that is suitable for inclusion
 in the Interoperability Guidelines. It is our hope that this listing will help
 foster awareness and understanding within the development community as tests
@ -178,7 +178,7 @@ are created, updated, or moved into Tempest over time.
    the Tempest source tree for its Guidelines.
 .. [2] Refer to the
    `Core Criteria
-    <http://opendev.org/openstack/interop/raw/branch/master/doc/source/process/CoreCriteria.rst>`_
+    <http://opendev.org/openinfra/interop/raw/branch/master/doc/source/process/CoreCriteria.rst>`_
    document for more details.
 .. [3] As of this writing. Refer to the
    `OpenStack API Complete Reference <http://developer.openstack.org/api-ref.html>`_
--- a/doc/source/process/2021A.rst
+++ b/doc/source/process/2021A.rst
@ -112,7 +112,7 @@ A3. Interop Working Group Collects Recommendations for
 A4. Interop Working Group identifies required capabilities

  1. The Interop Working Group uses Board approved scoring criteria
-     `scoring criteria <https://opendev.org/osf/interop/src/branch/master/doc/source/process/CoreCriteria.rst>`_
+     `scoring criteria <https://opendev.org/openinfra/interop/src/branch/master/doc/source/process/CoreCriteria.rst>`_
     to evaluate Capabilities.
  2. The Interop Working Group needs Board approval to change
     scoring criteria.
--- a/doc/source/schema/2.0.json
+++ b/doc/source/schema/2.0.json
@ -1,6 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-06/schema#",
-  "id": "http://opendev.org/openstack/interop/doc/source/schema/2.0.json",
+  "id": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
  "type": "object",
  "properties": {
    "metadata": {
--- a/doc/source/schema/next.2.0.json
+++ b/doc/source/schema/next.2.0.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "next",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2015.03.json
+++ b/guidelines/2015.03.json
@ -1,7 +1,7 @@
 {
  "id": "2015.03",
  "schema": "1.2",
-  "source": "http://opendev.org/openstack/interop/",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "replaces": "2014.07",
  "releases": ["havana", "icehouse"],
--- a/guidelines/2015.04.json
+++ b/guidelines/2015.04.json
@ -1,7 +1,7 @@
 {
  "id": "2015.04",
  "schema": "1.2",
-  "source": "http://opendev.org/openstack/interop/",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "replaces": "2015.03",
  "releases": ["havana", "icehouse", "juno"],
--- a/guidelines/2015.05.json
+++ b/guidelines/2015.05.json
@ -1,7 +1,7 @@
 {
  "id": "2015.05",
  "schema": "1.2",
-  "source": "http://opendev.org/openstack/interop/",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "replaces": "2015.04",
  "releases": ["icehouse", "juno", "kilo"],
--- a/guidelines/2015.07.json
+++ b/guidelines/2015.07.json
@ -1,8 +1,8 @@
 {
  "id": "2015.07",
  "schema": "1.5",
-  "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/1.5.json",
-  "source": "http://opendev.org/openstack/interop/",
+  "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/1.5.json",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "replaces": "2015.05",
  "target_approval": "2015-07-28",
--- a/guidelines/2015.07/procedure.rst
+++ b/guidelines/2015.07/procedure.rst
@ -4,7 +4,7 @@
 Testing against DefCore 2015.07 Capabilities
 --------------------------------------------

-https://opendev.org/openstack/interop/raw/branch/master/2015.07.json
+https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2015.07.json

 Tempest can be run standalone, or under a test runner such as refstack-client
 or rally. If only testing against DefCore capabilities, you can use the
--- a/guidelines/2016.01.json
+++ b/guidelines/2016.01.json
@ -1,8 +1,8 @@
 {
  "id": "2016.01",
  "schema": "1.5",
-  "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/1.5.json",
-  "source": "http://opendev.org/openstack/interop/",
+  "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/1.5.json",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "cutoff_score": "74",
  "target_approval": "2016-01-27",
--- a/guidelines/2016.01/procedure.rst
+++ b/guidelines/2016.01/procedure.rst
@ -4,7 +4,7 @@
 Testing against DefCore 2016.01 Capabilities
 --------------------------------------------

-https://opendev.org/openstack/interop/raw/branch/master/2016.01.json
+https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2016.01.json

 Tempest can be run standalone, or under a test runner such as refstack-client
 or rally. If only testing against DefCore capabilities, you can use the
--- a/guidelines/2016.08.json
+++ b/guidelines/2016.08.json
@ -1,8 +1,8 @@
 {
  "id": "2016.08",
  "schema": "1.6",
-  "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/1.6.json",
-  "source": "http://opendev.org/openstack/interop/",
+  "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/1.6.json",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "cutoff_score": "74",
  "target_approval": "2016-08-23",
--- a/guidelines/2016.08/procedure.rst
+++ b/guidelines/2016.08/procedure.rst
@ -4,7 +4,7 @@
 Testing against 2016.08 Capabilities
 -------------------------------------

-https://opendev.org/openstack/interop/raw/branch/master/2016.08.json
+https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2016.08.json

 Tempest can be run standalone, or under a test runner such as refstack-client
 or rally. If only testing against required capabilities, you can use the
--- a/guidelines/2017.01.json
+++ b/guidelines/2017.01.json
@ -1,8 +1,8 @@
 {
  "id": "2017.01",
  "schema": "1.6",
-  "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/1.6.json",
-  "source": "http://opendev.org/openstack/interop/",
+  "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/1.6.json",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "cutoff_score": "74",
  "target_approval": "2017-01-24",
--- a/guidelines/2017.09.json
+++ b/guidelines/2017.09.json
@ -1,8 +1,8 @@
 {
  "id": "2017.09",
  "schema": "1.6",
-  "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/1.6.json",
-  "source": "http://opendev.org/openstack/interop/",
+  "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/1.6.json",
+  "source": "https://opendev.org/openinfra/interop/",
  "status": "superseded",
  "cutoff_score": "74",
  "target_approval": "2017-09-10",
--- a/guidelines/2018.02.json
+++ b/guidelines/2018.02.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2018.02",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.02.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2018.11.json
+++ b/guidelines/2018.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2018.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/2018.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2018.11.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2019.06.json
+++ b/guidelines/2019.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2019.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/2019.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.06.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2019.11.json
+++ b/guidelines/2019.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2019.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/2019.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2019.11.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2020.06.json
+++ b/guidelines/2020.06.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2020.06",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/2020.06.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.06.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/2020.11.json
+++ b/guidelines/2020.11.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "2020.11",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/osf/interop/raw/branch/master/2020.11.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2020.11.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/guidelines/next.json
+++ b/guidelines/next.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "next",
    "schema": "2.0",
-    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/osf/interop/raw/branch/master/next.json",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/next.json",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
--- a/playbooks/parse_next_tests.yaml
+++ b/playbooks/parse_next_tests.yaml
@ -8,6 +8,6 @@
        ensure_global_symlinks: true

    - name: Get all next tests
-      command: tox -vv -enext -- --interop-repo {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/osf/interop'].src_dir }}
+      command: tox -vv -enext -- --interop-repo {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openinfra/interop'].src_dir }}
      args:
-        chdir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/osf/interop'].src_dir }}"
+        chdir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openinfra/interop'].src_dir }}"
--- a/tools/cross_check/cross_check.sh
+++ b/tools/cross_check/cross_check.sh
@ -44,7 +44,7 @@ HEAT_COMMIT=master
 MANILA_GIT_URL=https://opendev.org/openstack/manila-tempest-plugin.git
 MANILA_COMMIT=master

-INTEROP_GIT_URL=https://opendev.org/osf/interop.git
+INTEROP_GIT_URL=https://opendev.org/openinfra/interop.git
 INTEROP_COMMIT=master

 TMP_DIR=$(mktemp -d)
--- a/tools/cross_check/exclude_file.txt
+++ b/tools/cross_check/exclude_file.txt
@ -2,7 +2,7 @@
 # that should be ignored by the script. Each test (or group of tests) should
 # be accompanied by a comment explaining why the test should be ignored.

-# Tests marked as deprecated (see: https://review.opendev.org/c/osf/interop/+/800795/)
+# Tests marked as deprecated (see: https://review.opendev.org/c/openinfra/interop/+/800795/)
 tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsAssociationTestJSON.test_associate_already_associated_floating_ip
 tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsAssociationTestJSON.test_associate_disassociate_floating_ip
 tempest.api.compute.floating_ips.test_floating_ips_actions.FloatingIPsTestJSON.test_allocate_floating_ip
--- a/tools/parse_next_tests.py
+++ b/tools/parse_next_tests.py
@ -19,9 +19,9 @@ import os

 from refstack.api.guidelines import Guidelines

-BASE_URL = "https://opendev.org/api/v1/repos/osf/interop/"
+BASE_URL = "https://opendev.org/api/v1/repos/openinfra/interop/"
 REPO_URL = BASE_URL + "contents/guidelines"
-RAW_URL = "https://opendev.org/api/v1/repos/osf/interop/raw/"
+RAW_URL = "https://opendev.org/api/v1/repos/openinfra/interop/raw/"
 ADDITIONAL_CAPABILITY_URLS = BASE_URL + "contents/add-ons/guidelines"


--- a/verticals/nfv.next.json
+++ b/verticals/nfv.next.json
@ -2,8 +2,8 @@
  "metadata": {
    "id": "nfv.next",
    "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/",
+    "reference": "https://opendev.org/openinfra/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "http://opendev.org/openinfra/interop/",
    "scoring": {
      "cutoff_score": 74,
      "criteria": {
@ -84,7 +84,7 @@
        },
        {
          "name": "os_powered_compute",
-          "source": "https://opendev.org/openstack/interop/raw/branch/master/2017.09.json"
+          "source": "https://opendev.org/openinfra/interop/raw/branch/master/guidelines/2017.09.json"
        }
      ]
    }
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@ -11,13 +11,13 @@
        -d {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/designate-tempest-plugin'].src_dir }}
        -o {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/heat-tempest-plugin'].src_dir }}
        -s {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/manila-tempest-plugin'].src_dir }}
-      zuul_work_dir: src/opendev.org/osf/interop
+      zuul_work_dir: src/opendev.org/openinfra/interop
    required-projects:
      - name: openstack/tempest
      - name: openstack/designate-tempest-plugin
      - name: openstack/heat-tempest-plugin
      - name: openstack/manila-tempest-plugin
-      - name: osf/interop
+      - name: openinfra/interop

 - job:
    name: interop-next-refstack-client-master
@ -25,10 +25,10 @@
    description: |
      A job running refstack-client on a devstack environment with the next guideline.
    required-projects:
-      - name: osf/interop
+      - name: openinfra/interop
    pre-run: playbooks/parse_next_tests.yaml
    vars:
-      test_list: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/osf/interop'].src_dir }}/all_next_tests.txt"
+      test_list: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openinfra/interop'].src_dir }}/all_next_tests.txt"

 - job:
    name: interop-next-refstack-client-wallaby