opendev/system-config
Code Issues Proposed changes

Merge "Update git.zuul-ci.org redirects"

Browse Source
This commit is contained in:
Zuul
2020-03-19 01:21:20 +00:00
committed by Gerrit Code Review
parent 927072831b a6480bcefb
commit 51a5f5488f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/git-redirect.htaccess
View File

@@ -10,7 +10,7 @@ RewriteRule "^(cgit/|)(airship-.*)$" "$1openstack/$2" [L]
RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC] RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC]
RewriteRule "^(cgit/|)(stx-.*)$" "$1openstack/$2" [L] RewriteRule "^(cgit/|)(stx-.*)$" "$1openstack/$2" [L]
RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC] RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC]
RewriteRule "^(cgit/|)((nodepool|zuul).*)$" "$1openstack-infra/$2" [L] RewriteRule "^(cgit/|)((nodepool|zuul).*)$" "$1zuul/$2" [L]
################################### ###################################
# summary # summary

2
playbooks/roles/static/templates/git-redirects.conf.j2
View File

@@ -14,7 +14,7 @@ RewriteRule "^/(cgit/|)(airship-.*)$" "/$1openstack/$2"
RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC] RewriteCond %{HTTP_HOST} ^git\.starlingx\.io$ [NC]
RewriteRule "^/(cgit/|)(stx-.*)$" "/$1openstack/$2" RewriteRule "^/(cgit/|)(stx-.*)$" "/$1openstack/$2"
RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC] RewriteCond %{HTTP_HOST} ^git\.zuul-ci\.org$ [NC]
RewriteRule "^/(cgit/|)((nodepool|zuul).*)$" "/$1openstack-infra/$2" RewriteRule "^/(cgit/|)((nodepool|zuul).*)$" "/$1zuul/$2"
################################### ###################################
# summary # summary

3
testinfra/test_static.py
View File

@@ -137,7 +137,8 @@ git_redirects = (
('git.openstack.org/cgit/openstack/tripleo-ansible/commit/?id=a6f9b1551baf5f680c05f4fa69ac926f8a0a3f81', ('git.openstack.org/cgit/openstack/tripleo-ansible/commit/?id=a6f9b1551baf5f680c05f4fa69ac926f8a0a3f81',
'https://opendev.org/openstack/tripleo-ansible/commit/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/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.airshipit.org/airship-in-a-bottle', 'https://opendev.org/openstack/airship-in-a-bottle'),
('git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt', ('git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt',
'https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt') 'https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt')