openstack/tripleo-ci
Code Issues Proposed changes

OpenDev Migration Patch

Browse Source 
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
This commit is contained in:
OpenDev Sysadmins 2019-04-19 19:29:30 +00:00
parent 91c836da76
commit 8a21afc7ce
15 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitreview
View File

@ -1,4 +1,4 @@
[gerrit]
host=review.openstack.org
host=review.opendev.org
port=29418
project=openstack-infra/tripleo-ci.git
project=openstack/tripleo-ci.git

4
playbooks/tripleo-buildcontainers/pre.yaml
View File

@ -3,9 +3,9 @@
roles:
- role: tripleo-repos
override_repos: "{{ buildcontainers_override_repos | default('') }}"
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/tripleo-repos'].src_dir }}"
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}"
- 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:
- name: Run build containers pre tasks
include_role:

4
playbooks/tripleo-buildimage/run-v3.yaml
View File

@ -2,9 +2,9 @@
name: TripleO image building job
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 }}"
- role: tripleo-repos
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/tripleo-repos'].src_dir }}"
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}"
tasks:
- name: Include common buildimage vars
include_vars:

6
roles/build-containers/tasks/main.yaml
View File

@ -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://git.openstack.org/openstack/kolla
git ls-remote https://git.openstack.org/openstack/kolla | \
git remote add upstream https://opendev.org/openstack/kolla
git ls-remote https://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://git.openstack.org/openstack/kolla {} && \
xargs -I{} git fetch https://opendev.org/openstack/kolla {} && \
git checkout -b f28 FETCH_HEAD && \
git pull --rebase upstream master

4
roles/build-containers/tasks/pre.yaml
View File

@ -4,12 +4,12 @@
name: tripleo-repos
vars:
override_repos: "{{ buildcontainers_override_repos | default('') }}"
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/tripleo-repos'].src_dir }}"
tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}"
- name: install deps via bindep
include_role:
name: bindep
vars:
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 }}"
- name: Include common vars
include_vars:
dir: "vars"

4
roles/build-containers/vars/common.yaml
View File

@ -1,7 +1,7 @@
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"
# https://review.openstack.org/#/c/624838/
# https://review.opendev.org/#/c/624838/
kolla_f28_patch: 624838
virtualenv_python:

6
roles/common/vars/main.yaml
View File

@ -1,7 +1,7 @@
workspace: "{{ ansible_user_dir }}/workspace"
tripleo_root: "{{ ansible_user_dir }}/src/git.openstack.org/openstack"
tripleo_ci_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack-infra/tripleo-ci'].src_dir }}"
tripleo_quickstart_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/tripleo-quickstart'].src_dir }}"
tripleo_root: "{{ ansible_user_dir }}/src/opendev.org/openstack"
tripleo_ci_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-ci'].src_dir }}"
tripleo_quickstart_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-quickstart'].src_dir }}"
vxlan_vars: "-e toci_vxlan_networking='false' -e vxlan_networking='false'"
extra_vars: ""
job_featureset_file: "{{ tripleo_quickstart_dir }}/config/general_config/featureset{{ featureset }}.yml"

2
roles/prepare-node/tasks/main.yaml
View File

@ -32,7 +32,7 @@
# we still need all the repos under the same root directory, but instead of using
# zuul-cloner, use the wrapped commands directly
# reflink is an safer alternative to hardlinking which could fail
cp -dR --reflink=auto /home/zuul/src/git.openstack.org/openstack-infra/tripleo-ci .
cp -dR --reflink=auto /home/zuul/src/opendev.org/openstack/tripleo-ci .
executable: /bin/bash
chdir: '{{ tripleo_root }}'
environment: '{{ zuul | zuul_legacy_vars }}'

4
roles/run-test/templates/toci_gate_test.sh.j2
View File

@ -155,14 +155,14 @@ 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 - starting with browbeat, tripleo-ha-utils, openstack-ansible-os_tempest,
# ansible-config_template, ansible-role-python_venv_build
for EXTERNAL_REPO in 'browbeat' 'tripleo-ha-utils' 'tripleo-quickstart-extras' 'openstack-ansible-os_tempest' 'ansible-config_template' 'ansible-role-python_venv_build'; 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

2
roles/tripleo-repos/defaults/main.yml
View File

@ -1,6 +1,6 @@
---
# defaults file for tripleo-repos
tripleo_repos_repository: "git+https://git.openstack.org/openstack/tripleo-repos"
tripleo_repos_repository: "git+https://opendev.org/openstack/tripleo-repos"
workspace: "{{ ansible_user_dir }}"
centos_mirror_host: "http://mirror.centos.org"
fedora_mirror_host: "https://mirrors.fedoraproject.org"

36
zuul.d/base.yaml
View File

@ -21,20 +21,20 @@
bridge_mtu: 1350
nodeset: two-centos-7-nodes
roles:
- zuul: git.openstack.org/openstack-infra/zuul-jobs
- zuul: git.openstack.org/openstack-infra/openstack-zuul-jobs
- zuul: opendev.org/zuul/zuul-jobs
- zuul: opendev.org/openstack/openstack-zuul-jobs
required-projects:
- git.openstack.org/openstack-infra/tripleo-ci
- git.openstack.org/openstack/tripleo-quickstart
- git.openstack.org/openstack/tripleo-quickstart-extras
- git.openstack.org/openstack/tripleo-upgrade
- git.openstack.org/openstack/browbeat
- git.openstack.org/openstack/tripleo-ha-utils
- name: git.openstack.org/openstack/openstack-virtual-baremetal
- opendev.org/openstack/tripleo-ci
- opendev.org/openstack/tripleo-quickstart
- opendev.org/openstack/tripleo-quickstart-extras
- opendev.org/openstack/tripleo-upgrade
- opendev.org/x/browbeat
- opendev.org/openstack/tripleo-ha-utils
- name: opendev.org/openstack/openstack-virtual-baremetal
override-checkout: stable/1.0
- git.openstack.org/openstack/openstack-ansible-os_tempest
- git.openstack.org/openstack/ansible-role-python_venv_build
- git.openstack.org/openstack/ansible-config_template
- opendev.org/openstack/openstack-ansible-os_tempest
- opendev.org/openstack/ansible-role-python_venv_build
- opendev.org/openstack/ansible-config_template
pre-run:
- playbooks/nodepool-provider/pre.yaml
- playbooks/openstack-zuul-jobs/legacy/pre.yaml
@ -171,12 +171,12 @@
timeout: 7200
voting: false
required-projects:
- git.openstack.org/openstack/ansible-role-container-registry
- git.openstack.org/openstack/kolla
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/requirements
- git.openstack.org/openstack/tripleo-common
- git.openstack.org/openstack/tripleo-repos
- opendev.org/openstack/ansible-role-container-registry
- opendev.org/openstack/kolla
- opendev.org/openstack/python-tripleoclient
- opendev.org/openstack/requirements
- opendev.org/openstack/tripleo-common
- opendev.org/openstack/tripleo-repos
- job:
# Has file filters in order to be used with non-periodic triggers due to:

58
zuul.d/build-image.yaml
View File

@ -23,17 +23,17 @@
timeout: 4200
nodeset: single-centos-7-node
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/ironic
- git.openstack.org/openstack/ironic-python-agent
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/tripleo-common
- git.openstack.org/openstack/tripleo-image-elements
- git.openstack.org/openstack/tripleo-puppet-elements
- git.openstack.org/openstack/tripleo-repos
- git.openstack.org/openstack/requirements
- opendev.org/openstack/diskimage-builder
- opendev.org/openstack/heat-agents
- opendev.org/openstack/instack-undercloud
- opendev.org/openstack/ironic
- opendev.org/openstack/ironic-python-agent
- opendev.org/openstack/python-tripleoclient
- opendev.org/openstack/tripleo-common
- opendev.org/openstack/tripleo-image-elements
- opendev.org/openstack/tripleo-puppet-elements
- opendev.org/openstack/tripleo-repos
- opendev.org/openstack/requirements
vars:
tripleo_image_type: ironic-python-agent
tripleo_image_os: centos7
@ -50,15 +50,15 @@
timeout: 4200
nodeset: single-centos-7-node
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/requirements
- git.openstack.org/openstack/tripleo-common
- git.openstack.org/openstack/tripleo-image-elements
- git.openstack.org/openstack/tripleo-puppet-elements
- git.openstack.org/openstack/tripleo-repos
- opendev.org/openstack/diskimage-builder
- opendev.org/openstack/heat-agents
- opendev.org/openstack/instack-undercloud
- opendev.org/openstack/python-tripleoclient
- opendev.org/openstack/requirements
- opendev.org/openstack/tripleo-common
- opendev.org/openstack/tripleo-image-elements
- opendev.org/openstack/tripleo-puppet-elements
- opendev.org/openstack/tripleo-repos
vars:
tripleo_image_type: overcloud-full
tripleo_image_os: centos7
@ -74,15 +74,15 @@
timeout: 4200
nodeset: single-centos-7-node
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/tripleo-common
- git.openstack.org/openstack/tripleo-image-elements
- git.openstack.org/openstack/tripleo-puppet-elements
- git.openstack.org/openstack/tripleo-repos
- git.openstack.org/openstack/requirements
- opendev.org/openstack/diskimage-builder
- opendev.org/openstack/heat-agents
- opendev.org/openstack/instack-undercloud
- opendev.org/openstack/python-tripleoclient
- opendev.org/openstack/tripleo-common
- opendev.org/openstack/tripleo-image-elements
- opendev.org/openstack/tripleo-puppet-elements
- opendev.org/openstack/tripleo-repos
- opendev.org/openstack/requirements
vars:
tripleo_image_type: overcloud-hardened-full
tripleo_image_os: centos7

2
zuul.d/layout.yaml
View File

@ -1,6 +1,6 @@
---
# zuul.d/layout.yaml
# This file is the Zuul layout of openstack-infra/tripleo-ci project
# This file is the Zuul layout of openstack/tripleo-ci project
# It describes the jobs that will run when submitting a change in this
# repository.

2
zuul.d/multinode-jobs.yaml
View File

@ -247,7 +247,7 @@
nodes: 1ctlr
featureset: '037'
# Note (dmsimard): This enforces a minimum TTL for DNS records, see
# https://review.openstack.org/#/c/523178/ for context
# https://review.opendev.org/#/c/523178/ for context
unbound_cache_min_ttl: 900
extra_tags:
- overcloud-update

2
zuul.d/undercloud-jobs.yaml
View File

@ -50,7 +50,7 @@
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
# TODO(rlandy) make it voting when we confirm
# https://review.openstack.org/#/c/611800/
# https://review.opendev.org/#/c/611800/
# is working as expected.
voting: false
vars: