Update git.starlingx/git.airship redirects

After the big OpenDev rename, these repos got renamed again. Update the
redirects for git.airshipit.org and git.starlingx.io to point to the
current location.

Update test_static.py for this, change the test repo since
airship-in-a-bottle was first renamed to in-a-bottle and later to
airship-in-a-bottle.

Change-Id: I71b786cd528aac9ae68464618db02e22cd4c0b5b

modules/openstack_project/files/git-redirect.htaccess

@@ -6,9 +6,9 @@ RewriteRule "^(.*)$" "/$1?%1h=%2/%3%4" [N]
 
 # Map whitelabeled project git sites with repository prefixes
 RewriteCond %{HTTP_HOST} ^git\.airshipit\.org$ [NC]
-RewriteRule "^(cgit/|)(airship-.*)$" "$1openstack/$2" [L]
+RewriteRule "^(cgit/|)airship-(.*)$" "$1airship/$2" [L]
 RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC]
-RewriteRule "^(cgit/|)(stx-.*)$" "$1openstack/$2" [L]
+RewriteRule "^(cgit/|)stx-(.*)$" "$1starlingx/$2" [L]
 RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC]
 RewriteRule "^(cgit/|)((nodepool|zuul).*)$" "$1zuul/$2" [L]
 

playbooks/roles/static/templates/git-redirects.conf.j2

@@ -10,9 +10,9 @@ RewriteRule "^/(.*)$" "/$1?%1h=%2/%3%4" [N]
 
 # Map whitelabeled project git sites with repository prefixes
 RewriteCond %{HTTP_HOST} ^git\.airshipit\.org$ [NC]
-RewriteRule "^/(cgit/|)(airship-.*)$" "/$1openstack/$2"
+RewriteRule "^/(cgit/|)airship-(.*)$" "/$1airship/$2"
 RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC]
-RewriteRule "^/(cgit/|)(stx-.*)$" "/$1openstack/$2"
+RewriteRule "^/(cgit/|)stx-(.*)$" "/$1starlingx/$2"
 RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC]
 RewriteRule "^/(cgit/|)((nodepool|zuul).*)$" "/$1zuul/$2"
 

testinfra/test_static.py

@@ -136,10 +136,10 @@ git_redirects = (
     ('git.openstack.org/openstack/nova', 'https://opendev.org/openstack/nova'),
     ('git.openstack.org/cgit/openstack/tripleo-ansible/commit/?id=a6f9b1551baf5f680c05f4fa69ac926f8a0a3f81',
      'https://opendev.org/openstack/tripleo-ansible/commit/a6f9b1551baf5f680c05f4fa69ac926f8a0a3f81'),
-    ('git.starlingx.io/stx-tools', 'https://opendev.org/openstack/stx-tools'),
+    ('git.starlingx.io/stx-tools', 'https://opendev.org/starlingx/tools'),
     ('git.zuul-ci.org/zuul', 'https://opendev.org/zuul/zuul'),
     ('git.zuul-ci.org/nodepool', 'https://opendev.org/zuul/nodepool'),
-    ('git.airshipit.org/airship-in-a-bottle', 'https://opendev.org/openstack/airship-in-a-bottle'),
+    ('git.airshipit.org/airship-armada', 'https://opendev.org/airship/armada'),
     ('git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt',
      'https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt')
 )