diff --git a/.gitreview b/.gitreview index cf2f2c9a..d894c10b 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/python-tempestconf.git diff --git a/.zuul.yaml b/.zuul.yaml index b2b026da..6aaa704c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -40,19 +40,19 @@ - openstack/manila-tempest-plugin - openstack/python-tempestconf - openstack/tempest - - openstack-dev/devstack + - openstack/devstack roles: - zuul: openstack/python-tempestconf - zuul: openstack/tempest - - zuul: openstack-dev/devstack + - zuul: openstack/devstack vars: zuul_copy_output: '{{ devstack_base_dir }}/tempest/tempest.log': logs '{{ devstack_base_dir }}/tempest/etc/tempest.conf': logs '{{ zuul.project.src_dir }}/etc/accounts.yaml': logs devstack_plugins: - manila: https://git.openstack.org/openstack/manila - manila-ui: https://git.openstack.org/openstack/manila-ui + manila: https://opendev.org/openstack/manila + manila-ui: https://opendev.org/openstack/manila-ui devstack_localrc: MANILA_USE_UWSGI: False MANILA_USE_MOD_WSGI: False @@ -67,16 +67,16 @@ parent: packstack-allinone description: Base job for python-tempestconf on packstack environment required-projects: - - openstack/packstack + - x/packstack - openstack/python-tempestconf - openstack/tempest - - openstack-dev/devstack + - openstack/devstack post-run: playbooks/upload-logs.yaml roles: - - zuul: openstack/packstack + - zuul: x/packstack - zuul: openstack/python-tempestconf - zuul: openstack/tempest - - zuul: openstack-dev/devstack + - zuul: openstack/devstack vars: tempest_concurrency: 2 scenario: scenario000 diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml index 4ed6b72c..bfe3b4c7 100644 --- a/playbooks/python-tempestconf-tempest-devstack.yaml +++ b/playbooks/python-tempestconf-tempest-devstack.yaml @@ -1,6 +1,6 @@ - hosts: all roles: - # the role is inherited from openstack-dev/devstack project + # the role is inherited from openstack/devstack project - run-devstack - hosts: tempest @@ -8,7 +8,7 @@ # It's important that OS_AUTH_URL is in this format: # :///identity/v3 # In some cases it can be only: ://:5000 - # https://github.com/openstack-dev/devstack/blob/2c9343e5db44fa7a41ca6924737331dd9088ef8f/openrc#L87-L89 + # https://github.com/openstack/devstack/blob/2c9343e5db44fa7a41ca6924737331dd9088ef8f/openrc#L87-L89 # (mkopec) That would end up with an HTTP MaxRetryError to :5000, # therefor OS_AUTH_URL is defined manually set_auth_url: "OS_AUTH_URL=$SERVICE_PROTOCOL://$SERVICE_HOST/identity/v3" diff --git a/playbooks/python-tempestconf-tempest-packstack.yaml b/playbooks/python-tempestconf-tempest-packstack.yaml index 3fb7c6ee..1ecc3396 100644 --- a/playbooks/python-tempestconf-tempest-packstack.yaml +++ b/playbooks/python-tempestconf-tempest-packstack.yaml @@ -3,12 +3,12 @@ test_demo_user: "{{ test_demo is defined }}" tasks: # packstack-integration-tempest role is inherited from - # openstack/packstack project + # x/packstack project - name: Install packstack allinone include_role: name: packstack-integration-tempest # setup-tempest-user, setup-stack-user and setup-devstack-source-dirs - # are inherited from openstack-dev/devstack + # are inherited from openstack/devstack - name: Setup Stack user include_role: name: setup-stack-user diff --git a/roles/generate-accounts-file/tasks/main.yaml b/roles/generate-accounts-file/tasks/main.yaml index 303c44fb..26e9634b 100644 --- a/roles/generate-accounts-file/tasks/main.yaml +++ b/roles/generate-accounts-file/tasks/main.yaml @@ -77,4 +77,4 @@ when: accounts_file_destination is defined vars: - tempest_src_relative_path: "{{ zuul.projects['git.openstack.org/openstack/tempest'].src_dir }}" + tempest_src_relative_path: "{{ zuul.projects['opendev.org/openstack/tempest'].src_dir }}" diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index 6c0738ef..5acca7bd 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -99,4 +99,4 @@ cat {{ tempestconf_src_relative_path }}/etc/cloud_tempest.conf vars: - tempestconf_src_relative_path: "{{ zuul.projects['git.openstack.org/openstack/python-tempestconf'].src_dir }}" + tempestconf_src_relative_path: "{{ zuul.projects['opendev.org/openstack/python-tempestconf'].src_dir }}" diff --git a/roles/generate-tempestconf-file/tasks/main.yaml b/roles/generate-tempestconf-file/tasks/main.yaml index c566c42a..8030dfa7 100644 --- a/roles/generate-tempestconf-file/tasks/main.yaml +++ b/roles/generate-tempestconf-file/tasks/main.yaml @@ -68,4 +68,4 @@ when: output_path is defined vars: - tempestconf_src_relative_path: "{{ zuul.projects['git.openstack.org/openstack/python-tempestconf'].src_dir }}" + tempestconf_src_relative_path: "{{ zuul.projects['opendev.org/openstack/python-tempestconf'].src_dir }}"