From a6480bcefbaa7dab8908007ffa126025d4433a68 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 18 Mar 2020 18:28:42 +0100 Subject: [PATCH] Update git.zuul-ci.org redirects zuul and nodepool now life in opendev, avoid double redirects and redirect directly to final location. Change-Id: Ia55d76b24f07ec64cb55055955c4549f3706a95b --- modules/openstack_project/files/git-redirect.htaccess | 2 +- playbooks/roles/static/templates/git-redirects.conf.j2 | 2 +- testinfra/test_static.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/git-redirect.htaccess b/modules/openstack_project/files/git-redirect.htaccess index 5c073690f9..cbd7e5a506 100644 --- a/modules/openstack_project/files/git-redirect.htaccess +++ b/modules/openstack_project/files/git-redirect.htaccess @@ -10,7 +10,7 @@ RewriteRule "^(cgit/|)(airship-.*)$" "$1openstack/$2" [L] RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC] RewriteRule "^(cgit/|)(stx-.*)$" "$1openstack/$2" [L] RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC] -RewriteRule "^(cgit/|)((nodepool|zuul).*)$" "$1openstack-infra/$2" [L] +RewriteRule "^(cgit/|)((nodepool|zuul).*)$" "$1zuul/$2" [L] ################################### # summary diff --git a/playbooks/roles/static/templates/git-redirects.conf.j2 b/playbooks/roles/static/templates/git-redirects.conf.j2 index fbed8fa430..d49ad4ed52 100644 --- a/playbooks/roles/static/templates/git-redirects.conf.j2 +++ b/playbooks/roles/static/templates/git-redirects.conf.j2 @@ -14,7 +14,7 @@ RewriteRule "^/(cgit/|)(airship-.*)$" "/$1openstack/$2" RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC] RewriteRule "^/(cgit/|)(stx-.*)$" "/$1openstack/$2" RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC] -RewriteRule "^/(cgit/|)((nodepool|zuul).*)$" "/$1openstack-infra/$2" +RewriteRule "^/(cgit/|)((nodepool|zuul).*)$" "/$1zuul/$2" ################################### # summary diff --git a/testinfra/test_static.py b/testinfra/test_static.py index 194c36fa52..1de98903c3 100644 --- a/testinfra/test_static.py +++ b/testinfra/test_static.py @@ -137,7 +137,8 @@ git_redirects = ( ('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.zuul-ci.org/zuul', 'https://opendev.org/openstack-infra/zuul'), + ('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.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt', 'https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt')