OpenDev Migration Patch 2

These changes were missed by Sysadmin's proposed Migration Patch, this patch takes care of these missings. Also updated kolla review pull task to use review.opendev.org instead of opendev.org as remote url because opendev.org currently don't have review refs/changes synched due to gitea bug. Related-Bug: #1825732 Change-Id: I30646b0c5b95f391e9ab4bd767b468280ccb3842
2019-04-21 13:12:07 +05:30 · 2019-04-21 13:12:07 +05:30 · 93768b46ee
parent 441002000a
commit 93768b46ee
19 changed files with 29 additions and 29 deletions
--- a/README.rst
+++ b/README.rst
@ -20,7 +20,7 @@ Tools to help run CI jobs for TripleO. Includes things like:
 * Helper `getthelogs` script to download important job logs locally.
  Then you may want to inspect the logs for known errors and contribute
  discovered search patterns as the
-  `elastic-recheck queries <https://git.openstack.org/cgit/openstack-infra/elastic-recheck/tree/queries>`_.
+  `elastic-recheck queries <https://opendev.org/opendev/elastic-recheck/src/branch/master/queries>`_.


 OpenStack Infrastructure is deploying multiple jobs with different scenarios.
@ -146,7 +146,7 @@ Service testing matrix
 ----------------------

 The CI testing matrix for all scenarios is defined in
-`tripleo-heat-templates <https://git.openstack.org/cgit/openstack/tripleo-heat-templates/tree/README.rst>`_.
+`tripleo-heat-templates <https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/README.rst>`_.
 This matrix describes the services that will run in each environment.

 Feature testing matrix
--- a/playbooks/tripleo-buildimage/run.yaml
+++ b/playbooks/tripleo-buildimage/run.yaml
@ -3,7 +3,7 @@
  name: Autoconverted job legacy-tripleo-buildimage
  roles:
    - role: bindep
-      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/python-tripleoclient'].src_dir }}"
+      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/python-tripleoclient'].src_dir }}"

  tasks:

@ -28,7 +28,7 @@
          EOF
          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
            --cache-dir /opt/git \
-            https://git.openstack.org \
+            https://opendev.org \
            openstack/diskimage-builder \
            openstack/heat-agents \
            openstack/instack-undercloud \
--- a/playbooks/tripleo-buildimage/vars/common.yaml
+++ b/playbooks/tripleo-buildimage/vars/common.yaml
@ -1,2 +1,2 @@
 workspace: "{{ ansible_user_dir }}/workspace"
-openstack_git_root: "{{ ansible_user_dir }}/src/git.openstack.org/openstack"
+openstack_git_root: "{{ ansible_user_dir }}/src/opendev.org/openstack"
--- a/playbooks/tripleo-ci/run.yaml
+++ b/playbooks/tripleo-ci/run.yaml
@ -19,8 +19,8 @@
              dest: devstack-gate
          EOF
          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
        executable: /bin/bash
        chdir: '{{ ansible_user_dir }}/workspace'
      environment: '{{ zuul | zuul_legacy_vars }}'
--- a/roles/build-containers/tasks/main.yaml
+++ b/roles/build-containers/tasks/main.yaml
@ -41,13 +41,13 @@
    set -euxo pipefail
    git config --global user.email "zuul@openstack.org"
    git config --global user.name "Zuul"
-    git remote add upstream https://opendev.org/openstack/kolla
-    git ls-remote https://opendev.org/openstack/kolla | \
+    git remote add upstream https://review.opendev.org/openstack/kolla
+    git ls-remote https://review.opendev.org/openstack/kolla | \
      grep -E refs/changes/[[:digit:]]+/{{ kolla_f28_patch }}/ | \
      awk '{print $2}' | \
      sort -t / -k 5 -g -r | \
      head -1 | \
-      xargs -I{} git fetch https://opendev.org/openstack/kolla {} && \
+      xargs -I{} git fetch https://review.opendev.org/openstack/kolla {} && \
      git checkout -b f28 FETCH_HEAD && \
      git pull --rebase upstream master

--- a/roles/tripleo-repos/README.rst
+++ b/roles/tripleo-repos/README.rst
@ -15,7 +15,7 @@ Role Variables
     - Default Value
     - Description
   * - `tripleo_repos_repository`
-     - `git+https://git.openstack.org/openstack/tripleo-repos`
+     - `git+https://opendev.org/openstack/tripleo-repos`
     - Git repository to pip install tripleo-repos from
   * - `workspace`
     - `ansible_user_dir`
--- a/scripts/bighammer.sh
+++ b/scripts/bighammer.sh
@ -54,7 +54,7 @@ function tapper {
        sudo yum install -y git screen
        sudo mkdir -p /opt/stack/new
        sudo chown centos /opt/stack/new
-        git clone https://git.openstack.org/openstack-infra/tripleo-ci /opt/stack/new/tripleo-ci
+        git clone https://opendev.org/openstack/tripleo-ci /opt/stack/new/tripleo-ci
        cd /opt/stack/new/tripleo-ci
        DISTRIBUTION=CentOS DISTRIBUTION_MAJOR_VERSION=7 OVERRIDE_ZUUL_BRANCH= ZUUL_BRANCH=master WORKSPACE=/tmp TOCI_JOBTYPE=nonha DEVSTACK_GATE_TIMEOUT=180 ./toci_gate_test.sh
        exit 0
--- a/scripts/deploy-server.sh
+++ b/scripts/deploy-server.sh
@ -18,7 +18,7 @@ fi

 CIREPO=/opt/stack/tripleo-ci
 mkdir -p $CIREPO
-git clone https://git.openstack.org/openstack-infra/tripleo-ci $CIREPO
+git clone https://opendev.org/openstack/tripleo-ci $CIREPO

 if [ -f $CIREPO/scripts/$(hostname)/$(hostname).sh ] ; then
    bash $CIREPO/scripts/$(hostname)/$(hostname).sh
--- a/scripts/mirror-server/mirror-server.pp
+++ b/scripts/mirror-server/mirror-server.pp
@ -8,7 +8,7 @@ package{"python34": }
 exec{"setenforce  0":}

 vcsrepo {"/opt/stack/tripleo-ci":
-    source => "https://git.openstack.org/openstack-infra/tripleo-ci",
+    source => "https://opendev.org/openstack/tripleo-ci",
    provider => git,
    ensure => latest,
 }
--- a/scripts/prepare-ovb-cloud.sh
+++ b/scripts/prepare-ovb-cloud.sh
@ -23,7 +23,7 @@ glance image-create --progress --name 'CentOS-7-x86_64-GenericCloud' --is-public

 glance image-show 'ipxe-boot' || \
 glance image-create --name ipxe-boot --is-public true --disk-format qcow2 --property os_shutdown_timeout=5 --container-format bare \
-    --copy-from https://git.openstack.org/cgit/openstack/openstack-virtual-baremetal/plain/ipxe/ipxe-boot.qcow2
+    --copy-from https://opendev.org/openstack/openstack-virtual-baremetal/raw/branch/master/ipxe/ipxe-boot.qcow2

 # Create a pool of floating IP's
 neutron net-show public || neutron net-create public --router:external=True
--- a/scripts/proxy-server/proxy-server.pp
+++ b/scripts/proxy-server/proxy-server.pp
@ -1,7 +1,7 @@
 Exec { path => [ "/bin/", "/sbin/" ] }

 vcsrepo {"/opt/stack/tripleo-ci":
-    source => "https://git.openstack.org/openstack-infra/tripleo-ci",
+    source => "https://opendev.org/openstack/tripleo-ci",
    provider => git,
    ensure => latest,
 }
--- a/scripts/te-broker/create-env
+++ b/scripts/te-broker/create-env
@ -22,7 +22,7 @@ source /etc/nodepoolrc
 set -x

 if [ ! -e /opt/stack/openstack-virtual-baremetal ] ; then
-    sudo git clone https://git.openstack.org/openstack/openstack-virtual-baremetal.git /opt/stack/openstack-virtual-baremetal
+    sudo git clone https://opendev.org/openstack/openstack-virtual-baremetal.git /opt/stack/openstack-virtual-baremetal
    sudo chown -R $USER /opt/stack/openstack-virtual-baremetal
 fi

--- a/scripts/te-broker/te-broker.pp
+++ b/scripts/te-broker/te-broker.pp
@ -1,13 +1,13 @@
 Exec { path => [ "/bin/", "/sbin/" ] }

 vcsrepo {"/opt/stack/openstack-virtual-baremetal":
-    source => "https://git.openstack.org/openstack/openstack-virtual-baremetal.git",
+    source => "https://opendev.org/openstack/openstack-virtual-baremetal.git",
    provider => git,
    ensure => latest,
 }

 vcsrepo {"/opt/stack/tripleo-ci":
-    source => "https://git.openstack.org/openstack-infra/tripleo-ci",
+    source => "https://opendev.org/openstack/tripleo-ci",
    provider => git,
    ensure => latest,
 }
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@ -466,7 +466,7 @@ function delorean_build {

        # Clone the repo if it doesn't yet exist
        if [ ! -d $TRIPLEO_ROOT/$PROJ ]; then
-            git clone https://git.openstack.org/openstack/$PROJ.git $TRIPLEO_ROOT/$PROJ
+            git clone https://opendev.org/openstack/$PROJ.git $TRIPLEO_ROOT/$PROJ
            if [ ! -z "$REVIEW_RELEASE" ]; then
                pushd $TRIPLEO_ROOT/$PROJ
                git checkout -b stable/$REVIEW_RELEASE origin/stable/$REVIEW_RELEASE
@ -1186,7 +1186,7 @@ function clone {
    if [ ! -d $TRIPLEO_ROOT/$(basename $repo) ]; then
        echo "$repo not found at $TRIPLEO_ROOT/$repo, git cloning."
        pushd $TRIPLEO_ROOT
-        git clone https://git.openstack.org/$repo
+        git clone https://opendev.org/$repo
        popd
    else
        echo "$repo found at $TRIPLEO_ROOT/$repo, nothing to do."
--- a/scripts/website/generate_site.sh
+++ b/scripts/website/generate_site.sh
@ -24,7 +24,7 @@ SKIP_BLOG=${SKIP_BLOG:-''}

 # TRIPLEO-DOCS
 if [ ! -d tripleo-docs ]; then
-    git clone https://git.openstack.org/openstack/tripleo-docs
+    git clone https://opendev.org/openstack/tripleo-docs
    pushd tripleo-docs
    tox -edocs #initial run
    popd
@ -60,7 +60,7 @@ popd

 #REVIEWDAY
 if [ ! -d reviewday ]; then
-    git clone https://git.openstack.org/openstack-infra/reviewday
+    git clone https://opendev.org/openstack/reviewday
 else
    pushd reviewday
    git reset --hard origin/master
@ -70,7 +70,7 @@ fi

 #TRIPLEO CI
 if [ ! -d tripleo-ci ]; then
-    git clone https://git.openstack.org/openstack-infra/tripleo-ci
+    git clone https://opendev.org/openstack/tripleo-ci
 else
    pushd tripleo-ci
    git reset --hard origin/master
--- a/setup.cfg
+++ b/setup.cfg
@ -5,7 +5,7 @@ description-file =
    README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
-home-page = http://git.openstack.org/cgit/openstack-infra/tripleo-ci
+home-page = http://opendev.org/openstack/tripleo-ci
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
--- a/toci-quickstart/config/testenv/multinode.yml
+++ b/toci-quickstart/config/testenv/multinode.yml
@ -44,7 +44,7 @@ update_containers: >-
  {%- endif -%}

 #build-test packages
-artg_repos_dir: /home/zuul/src/git.openstack.org/openstack
+artg_repos_dir: /home/zuul/src/opendev.org/openstack
 # InfluxDB module settings
 influxdb_only_successful_tasks: true
 influxdb_measurement: job
--- a/toci-quickstart/config/testenv/ovb.yml
+++ b/toci-quickstart/config/testenv/ovb.yml
@ -68,7 +68,7 @@ ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master
 ara_graphite_server: 66.187.229.172

 #build-test packages
-artg_repos_dir: /home/zuul/src/git.openstack.org/openstack
+artg_repos_dir: /home/zuul/src/opendev.org/openstack

 # https://bugs.launchpad.net/tripleo/+bug/1799895
 undercloud_workers: 1
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@ -253,13 +253,13 @@ if [[ -d $TRIPLEO_ROOT/tripleo-upgrade ]]; then
 else
    # Otherwise, if not importing it, oooq will fail when loading
    # tripleo-upgrade role in the playbook.
-    echo "git+https://git.openstack.org/openstack/tripleo-upgrade.git@${ZUUL_BRANCH}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
+    echo "git+https://opendev.org/openstack/tripleo-upgrade.git@${ZUUL_BRANCH}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
 fi

 # Import gated external repo in oooq
 for EXTERNAL_REPO in 'browbeat' 'tripleo-ha-utils' 'tripleo-quickstart-extras'; do
    if [[ -d $TRIPLEO_ROOT/$EXTERNAL_REPO ]]; then
-        sed -i "s#git+https://git.openstack.org/openstack/$EXTERNAL_REPO#file://${TRIPLEO_ROOT}/$EXTERNAL_REPO#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
+        sed -i "s#git+https://opendev.org/openstack/$EXTERNAL_REPO#file://${TRIPLEO_ROOT}/$EXTERNAL_REPO#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
    fi
 done