Browse Source

Replace git.openstack.org URLs with opendev.org URLs

Thorough replacement of git.openstack.org URLs with their opendev.org
counterparts.

Port of the present changes are needed to fix some errors in legacy jobs when
opendev.org is used as git base URL, as devstack-gate tries to clone
openstack-dev/devstack and it fails (the redirect works only when
git.openstack.org is used).

Change-Id: I81f6e00aa10ef7f93d0dead2f76369035a18a81b
changes/88/653988/1
Luigi Toscano 2 years ago
parent
commit
9459f44cb5
6 changed files with 40 additions and 45 deletions
  1. +11
    -11
      README.rst
  2. +5
    -10
      devstack-vm-gate-wrap.sh
  3. +4
    -4
      functions.sh
  4. +3
    -3
      help/tempest-logs.html
  5. +3
    -3
      help/tempest-overview.html
  6. +14
    -14
      test-functions.sh

+ 11
- 11
README.rst View File

@ -38,7 +38,7 @@ external dependencies during the run.
The `Nodepool`_ project is used to maintain this pool of machines.
.. _Nodepool: https://git.openstack.org/cgit/openstack-infra/nodepool
.. _Nodepool: https://opendev.org/zuul/nodepool
How to Debug a Devstack Gate Failure
====================================
@ -104,11 +104,11 @@ and troubleshoot failures or tease out nondeterministic bugs.
First, you can build an image identical to the images running in the gate using
`diskimage-builder <https://docs.openstack.org/developer/diskimage-builder>`_.
The specific operating systems built and DIB elements for each image type are
defined in `nodepool.yaml <http://git.openstack.org/cgit/openstack-infra/
project-config/tree/nodepool/nodepool.yaml>`_. There is a handy script
defined in `nodepool.yaml <https://opendev.org/openstack/project-config/
src/branch/master/nodepool/nodepool.yaml>`_. There is a handy script
available in the project-config repo to build this for you::
git clone https://git.openstack.org/openstack-infra/project-config
git clone https://opendev.org/openstack/project-config
cd project-config
./tools/build-image.sh
@ -199,11 +199,11 @@ make sure ``HEAD`` is at the ref you want tested::
Switch to the workspace and get a copy of devstack-gate::
cd $WORKSPACE \
&& git clone --depth 1 $REPO_URL/openstack-infra/devstack-gate
&& git clone --depth 1 $REPO_URL/openstack/devstack-gate
At this point you're ready to set the same environment variables and run
the same commands/scripts as used in the desired job. The definitions
for these are found in the openstack-infra/project-config project under
for these are found in the openstack/project-config project under
the jenkins/jobs directory in a file named devstack-gate.yaml. It will
probably look something like::
@ -215,7 +215,7 @@ probably look something like::
If you're trying to figure out which devstack gate jobs run for a given
project+branch combination, this is encoded in the
openstack-infra/project-config project under the zuul/ directory in a file
openstack/project-config project under the zuul/ directory in a file
named layout.yaml. You'll want to look in the "projects" section for a list
of jobs run on a given project in the "gate" pipeline, and then consult the
"jobs" section of the file to see if there are any overrides indicating
@ -244,10 +244,10 @@ managed in source code repositories just like the code of OpenStack
itself. If you'd like to contribute, just clone and propose a patch to
the relevant repository::
https://git.openstack.org/cgit/openstack-infra/devstack-gate
https://git.openstack.org/cgit/openstack-infra/nodepool
https://git.openstack.org/cgit/openstack-infra/system-config
https://git.openstack.org/cgit/openstack-infra/project-config
https://opendev.org/openstack/devstack-gate
https://opendev.org/zuul/nodepool
https://opendev.org/opendev/system-config
https://opendev.org/openstack/project-config
You can file bugs on the storyboard devstack-gate project::


+ 5
- 10
devstack-vm-gate-wrap.sh View File

@ -22,7 +22,7 @@
# Most of the work of this script is done in functions so that we may
# easily redirect their stdout / stderr to log files.
GIT_BASE=${GIT_BASE:-https://git.openstack.org}
GIT_BASE=${GIT_BASE:-https://opendev.org}
GIT_BRANCH=${GIT_BRANCH:-master}
# We're using enough ansible specific features that it's extremely
@ -66,8 +66,8 @@ export DEVSTACK_PROJECT_FROM_GIT=${DEVSTACK_PROJECT_FROM_GIT:-}
# below.
# See: https://bugs.launchpad.net/openstack-gate/+bug/1544827
JOB_PROJECTS="$PROJECTS"
PROJECTS="openstack-infra/devstack-gate $PROJECTS"
PROJECTS="openstack-dev/devstack $PROJECTS"
PROJECTS="openstack/devstack-gate $PROJECTS"
PROJECTS="openstack/devstack $PROJECTS"
PROJECTS="openstack/ceilometer $PROJECTS"
PROJECTS="openstack/ceilometermiddleware $PROJECTS"
PROJECTS="openstack/cinder $PROJECTS"
@ -92,7 +92,7 @@ PROJECTS="openstack/tempest $PROJECTS"
# reason for this is to reduce job runtimes, every git repo
# has to be cloned and updated and checked out to the proper ref
# which is not free.
PROJECTS="openstack-infra/tripleo-ci $PROJECTS"
PROJECTS="openstack/tripleo-ci $PROJECTS"
# The devstack heat plugin uses these repos
if [[ "$DEVSTACK_GATE_HEAT" -eq "1" ]] ; then
PROJECTS="openstack/dib-utils $PROJECTS"
@ -129,11 +129,6 @@ if [[ -n "$DEVSTACK_PROJECT_FROM_GIT" ]] ; then
TRAILING_COMMA_REMOVED=$(echo "$DEVSTACK_PROJECT_FROM_GIT" | sed -e 's/,$//')
PROCESSED_FROM_GIT=$(echo "openstack/$TRAILING_COMMA_REMOVED" | sed -e 's/,/ openstack\//g')
PROJECTS="$PROCESSED_FROM_GIT $PROJECTS"
# hack any known exceptions here until namespaces are unified
PROJECTS=$(echo $PROJECTS | sed -e 's|openstack/pbr|openstack-dev/pbr|g')
PROJECTS=$(echo $PROJECTS | sed -e 's|openstack/shade|openstack-infra/shade|g')
PROJECTS=$(echo $PROJECTS | sed -e 's|openstack/glean|openstack-infra/glean|g')
fi
# Include openstack/placement starting in Stein.
@ -438,7 +433,7 @@ export DEVSTACK_GATE_UNSTACK=${DEVSTACK_GATE_UNSTACK:-0}
export DEVSTACK_GATE_TOPOLOGY=${DEVSTACK_GATE_TOPOLOGY:-aio}
# Set to a space-separated list of projects to prepare in the
# workspace, e.g. 'openstack-dev/devstack openstack/neutron'.
# workspace, e.g. 'openstack/devstack openstack/neutron'.
# Minimizing the number of targeted projects can reduce the setup cost
# for jobs that know exactly which repos they need.
export DEVSTACK_GATE_PROJECTS_OVERRIDE=${DEVSTACK_GATE_PROJECTS_OVERRIDE:-""}


+ 4
- 4
functions.sh View File

@ -199,11 +199,11 @@ fi
cat > clonemap.yaml << IEOF
clonemap:
- name: openstack-infra/devstack-gate
- name: openstack/devstack-gate
dest: devstack-gate
IEOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git https://git.openstack.org openstack-infra/devstack-gate
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git https://opendev.org openstack/devstack-gate
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
@ -359,7 +359,7 @@ function git_clone_and_cd {
# The tip of the master branch
#
# If you would like to use a particular git base for a project other than
# GIT_BASE or https://git.openstack.org, for example in order to use
# GIT_BASE or https://opendev.org, for example in order to use
# a particular repositories for a third party CI, then supply that using
# variable OVERRIDE_${PROJECT}_GIT_BASE instead.
# (e.g. OVERRIDE_TEMPEST_GIT_BASE=http://example.com)
@ -369,7 +369,7 @@ function setup_project {
local branch=$2
local short_project
short_project=$(basename $project)
local git_base=${GIT_BASE:-https://git.openstack.org}
local git_base=${GIT_BASE:-https://opendev.org}
# allow for possible project branch override
local uc_project
uc_project=$(echo $short_project | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//')


+ 3
- 3
help/tempest-logs.html View File

@ -176,10 +176,10 @@
<h2>About this Help</h2>
<p>
This help file is part of the
<a href="https://git.openstack.org/cgit/openstack-infra/devstack-gate">
openstack-infra/devstack-gate</a>
<a href="https://opendev.org/openstack/devstack-gate">
openstack/devstack-gate</a>
project, and can be found at
<a href="https://git.openstack.org/cgit/openstack-infra/devstack-gate/tree/help/tempest-logs.html">
<a href="https://opendev.org/openstack/devstack-gate/src/branch/master/help/tempest-logs.html">
help/tempest-logs.html
</a>.
The file can be updated via the standard OpenStack Gerrit Review process.


+ 3
- 3
help/tempest-overview.html View File

@ -46,10 +46,10 @@ job. The basic flow of the file goes as follows:
<h2>About this Help</h2>
<p>
This help file is part of the
<a href="https://git.openstack.org/cgit/openstack-infra/devstack-gate">
openstack-infra/devstack-gate</a>
<a href="https://opendev.org/openstack/devstack-gate">
openstack/devstack-gate</a>
project, and can be found at
<a href="https://git.openstack.org/cgit/openstack-infra/devstack-gate/tree/help/tempest-overview.html">
<a href="https://opendev.org/openstack/devstack-gate/src/branch/master/help/tempest-overview.html">
help/tempest-overview.html
</a>.
The file can be updated via the standard OpenStack Gerrit Review process.


+ 14
- 14
test-functions.sh View File

@ -132,12 +132,12 @@ function test_one_on_master {
for aar_var in $LOCAL_AAR_VARS; do
eval `echo "declare -A $aar_var"`
done
local ZUUL_PROJECT='openstack-infra/devstack-gate'
local ZUUL_PROJECT='openstack/devstack-gate'
local ZUUL_BRANCH='master'
local ZUUL_REF='refs/zuul/master/ZA'
TEST_ZUUL_REFS[devstack-gate]+=' refs/zuul/master/ZA'
setup_project openstack-infra/devstack-gate $ZUUL_BRANCH
setup_project openstack/devstack-gate $ZUUL_BRANCH
assert_equal "${TEST_GIT_CHECKOUTS[devstack-gate]}" 'refs/zuul/master/ZA'
}
@ -155,7 +155,7 @@ function test_two_on_master {
TEST_ZUUL_REFS[devstack-gate]+=' refs/zuul/master/ZB'
TEST_ZUUL_REFS[glance]+=' refs/zuul/master/ZB'
setup_project openstack-infra/devstack-gate $ZUUL_BRANCH
setup_project openstack/devstack-gate $ZUUL_BRANCH
setup_project openstack/glance $ZUUL_BRANCH
assert_equal "${TEST_GIT_CHECKOUTS[devstack-gate]}" 'refs/zuul/master/ZB'
@ -179,7 +179,7 @@ function test_multi_branch_on_master {
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZC'
TEST_ZUUL_REFS[python-glanceclient]+=' refs/zuul/master/ZC'
setup_project openstack-infra/devstack-gate $ZUUL_BRANCH
setup_project openstack/devstack-gate $ZUUL_BRANCH
setup_project openstack/glance $ZUUL_BRANCH
setup_project openstack/python-glanceclient $ZUUL_BRANCH
@ -212,7 +212,7 @@ function test_multi_branch_project_override {
TEST_ZUUL_REFS[python-glanceclient]+=' refs/zuul/master/ZD'
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZD'
setup_project openstack-infra/devstack-gate $ZUUL_BRANCH
setup_project openstack/devstack-gate $ZUUL_BRANCH
setup_project openstack/glance $ZUUL_BRANCH
setup_project openstack/python-glanceclient $ZUUL_BRANCH
setup_project openstack/tempest $ZUUL_BRANCH
@ -241,7 +241,7 @@ function test_multi_branch_on_stable {
TEST_ZUUL_REFS[devstack-gate]+=' refs/zuul/master/ZB'
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZB'
setup_project openstack-infra/devstack-gate $ZUUL_BRANCH
setup_project openstack/devstack-gate $ZUUL_BRANCH
setup_project openstack/glance $ZUUL_BRANCH
setup_project openstack/python-glanceclient $ZUUL_BRANCH
@ -253,7 +253,7 @@ function test_multi_branch_on_stable {
function test_multi_git_base_project_override {
# osrg/ryu https://github.com
# test/devstack-gate https://example.com
# openstack/keystone https://git.openstack.org
# openstack/keystone https://opendev.org
# openstack/glance http://tarballs.openstack.org
for aar_var in $LOCAL_AAR_VARS; do
eval `echo "declare -A $aar_var"`
@ -263,7 +263,7 @@ function test_multi_git_base_project_override {
local ZUUL_BRANCH='master'
local ZUUL_REF='refs/zuul/master/ZA'
local GIT_BASE=""
local GIT_BASE_DEF="https://git.openstack.org"
local GIT_BASE_DEF="https://opendev.org"
local OVERRIDE_RYU_GIT_BASE='https://github.com'
setup_project "osrg/ryu" $ZUUL_BRANCH
@ -314,7 +314,7 @@ function test_grenade_backward {
TEST_ZUUL_REFS[keystone]+=' refs/zuul/master/ZE'
TEST_ZUUL_REFS[glance]+=' refs/zuul/master/ZE'
setup_project openstack-infra/devstack-gate $GRENADE_OLD_BRANCH
setup_project openstack/devstack-gate $GRENADE_OLD_BRANCH
setup_project openstack/nova $GRENADE_OLD_BRANCH
setup_project openstack/keystone $GRENADE_OLD_BRANCH
setup_project openstack/glance $GRENADE_OLD_BRANCH
@ -330,7 +330,7 @@ function test_grenade_backward {
declare -A TEST_GIT_CHECKOUTS
setup_project openstack-infra/devstack-gate $GRENADE_NEW_BRANCH
setup_project openstack/devstack-gate $GRENADE_NEW_BRANCH
setup_project openstack/nova $GRENADE_NEW_BRANCH
setup_project openstack/keystone $GRENADE_NEW_BRANCH
setup_project openstack/glance $GRENADE_NEW_BRANCH
@ -379,7 +379,7 @@ function test_grenade_forward {
TEST_ZUUL_REFS[keystone]+=' refs/zuul/master/ZE'
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZE'
setup_project openstack-infra/devstack-gate $GRENADE_OLD_BRANCH
setup_project openstack/devstack-gate $GRENADE_OLD_BRANCH
setup_project openstack/nova $GRENADE_OLD_BRANCH
setup_project openstack/keystone $GRENADE_OLD_BRANCH
setup_project openstack/glance $GRENADE_OLD_BRANCH
@ -395,7 +395,7 @@ function test_grenade_forward {
declare -A TEST_GIT_CHECKOUTS
setup_project openstack-infra/devstack-gate $GRENADE_NEW_BRANCH
setup_project openstack/devstack-gate $GRENADE_NEW_BRANCH
setup_project openstack/nova $GRENADE_NEW_BRANCH
setup_project openstack/keystone $GRENADE_NEW_BRANCH
setup_project openstack/glance $GRENADE_NEW_BRANCH
@ -419,7 +419,7 @@ function test_branch_override {
for aar_var in $LOCAL_AAR_VARS; do
eval `echo "declare -A $aar_var"`
done
local ZUUL_PROJECT='openstack-infra/devstack-gate'
local ZUUL_PROJECT='openstack/devstack-gate'
local ZUUL_BRANCH='master'
local ZUUL_REF='refs/zuul/master/ZB'
local OVERRIDE_ZUUL_BRANCH='stable/havana'
@ -427,7 +427,7 @@ function test_branch_override {
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZA'
TEST_ZUUL_REFS[glance]+=' refs/zuul/stable/havana/ZB'
setup_project openstack-infra/devstack-gate $OVERRIDE_ZUUL_BRANCH
setup_project openstack/devstack-gate $OVERRIDE_ZUUL_BRANCH
setup_project openstack/glance $OVERRIDE_ZUUL_BRANCH
setup_project openstack/swift $OVERRIDE_ZUUL_BRANCH
setup_project openstack/python-glanceclient $OVERRIDE_ZUUL_BRANCH


Loading…
Cancel
Save