diff --git a/README.rst b/README.rst index 56ef4db3ff..ddf7113568 100644 --- a/README.rst +++ b/README.rst @@ -33,10 +33,10 @@ IRC. Contributing ------------ -To browse the latest code, see: https://git.zuul-ci.org/cgit/zuul/tree/ -To clone the latest code, use `git clone https://git.zuul-ci.org/zuul` +To browse the latest code, see: https://opendev.org/zuul/zuul +To clone the latest code, use `git clone https://opendev.org/zuul/zuul` -Bugs are handled at: https://storyboard.openstack.org/#!/project/openstack-infra/zuul +Bugs are handled at: https://storyboard.openstack.org/#!/project/zuul/zuul Suspected security vulnerabilities are most appreciated if first reported privately following any of the supported mechanisms diff --git a/doc/source/admin/drivers/git.rst b/doc/source/admin/drivers/git.rst index e0acec1168..908dfc775f 100644 --- a/doc/source/admin/drivers/git.rst +++ b/doc/source/admin/drivers/git.rst @@ -4,7 +4,7 @@ Git === This driver can be used to load Zuul configuration from public Git repositories, -for instance from ``openstack-infra/zuul-jobs`` that is suitable for use by +for instance from ``opendev.org/zuul/zuul-jobs`` that is suitable for use by any Zuul system. It can also be used to trigger jobs from ``ref-updated`` events in a pipeline. diff --git a/doc/source/admin/examples/etc_zuul/main.yaml b/doc/source/admin/examples/etc_zuul/main.yaml index b346fc89e8..b3674844e9 100644 --- a/doc/source/admin/examples/etc_zuul/main.yaml +++ b/doc/source/admin/examples/etc_zuul/main.yaml @@ -7,8 +7,8 @@ untrusted-projects: - test1 - test2 - zuul-ci.org: + opendev.org: untrusted-projects: - - zuul-jobs: + - zuul/zuul-jobs: include: - job diff --git a/doc/source/admin/examples/etc_zuul/zuul.conf b/doc/source/admin/examples/etc_zuul/zuul.conf index 1bb0cf7b3e..b60a1604ee 100644 --- a/doc/source/admin/examples/etc_zuul/zuul.conf +++ b/doc/source/admin/examples/etc_zuul/zuul.conf @@ -20,10 +20,10 @@ password=secret baseurl=http://gerrit:8080 auth_type=basic -[connection "zuul-ci.org"] -name=zuul-ci +[connection "opendev.org"] +name=opendev driver=git -baseurl=https://git.zuul-ci.org/ +baseurl=https://opendev.org [connection "mysql"] name=mysql diff --git a/doc/source/admin/examples/zuul-config/zuul.d/jobs2.yaml b/doc/source/admin/examples/zuul-config/zuul.d/jobs2.yaml index 013560d714..8b70ffecaf 100644 --- a/doc/source/admin/examples/zuul-config/zuul.d/jobs2.yaml +++ b/doc/source/admin/examples/zuul-config/zuul.d/jobs2.yaml @@ -14,7 +14,7 @@ - playbooks/base/post-ssh.yaml - playbooks/base/post-logs.yaml roles: - - zuul: zuul-jobs + - zuul: zuul/zuul-jobs timeout: 1800 nodeset: nodes: diff --git a/doc/source/admin/github_setup.rst b/doc/source/admin/github_setup.rst index f99c2cf10a..5fccb1a671 100644 --- a/doc/source/admin/github_setup.rst +++ b/doc/source/admin/github_setup.rst @@ -108,9 +108,9 @@ Edit ``/etc/zuul/main.yaml`` so that it looks like this: source: zuul-git: config-projects: - - zuul-base-jobs + - zuul/zuul-base-jobs untrusted-projects: - - zuul-jobs + - zuul/zuul-jobs github: config-projects: - my-org/zuul-test-config diff --git a/doc/source/admin/nodepool_install.rst b/doc/source/admin/nodepool_install.rst index a48c82db40..d4ac7ba389 100644 --- a/doc/source/admin/nodepool_install.rst +++ b/doc/source/admin/nodepool_install.rst @@ -30,7 +30,7 @@ are required. .. code-block:: shell # All: - git clone https://git.zuul-ci.org/nodepool + git clone https://opendev.org/zuul/nodepool pushd nodepool/ # For Fedora and CentOS: diff --git a/doc/source/admin/quick-start.rst b/doc/source/admin/quick-start.rst index 92dce06bf1..27864c05bc 100644 --- a/doc/source/admin/quick-start.rst +++ b/doc/source/admin/quick-start.rst @@ -54,7 +54,7 @@ Clone the Zuul repository: .. code-block:: shell - git clone https://git.zuul-ci.org/zuul + git clone https://opendev.org/zuul/zuul Then cd into the directory containing this document, and run docker-compose in order to start Zuul, Nodepool and Gerrit. @@ -65,7 +65,7 @@ docker-compose in order to start Zuul, Nodepool and Gerrit. sudo -E docker-compose up For reference, the files in that directory are also `browsable on the web -`_. +`_. All of the services will be started with debug-level logging sent to the standard output of the terminal where docker-compose is running. diff --git a/doc/source/admin/tenants.rst b/doc/source/admin/tenants.rst index 5680b00799..ade02d42a3 100644 --- a/doc/source/admin/tenants.rst +++ b/doc/source/admin/tenants.rst @@ -45,7 +45,7 @@ configuration. Some examples of tenant definitions are: - shared-jobs: include: job untrusted-projects: - - zuul-jobs: + - zuul/zuul-jobs: shadow: common-config - project1 - project2: diff --git a/doc/source/admin/zuul-from-scratch.rst b/doc/source/admin/zuul-from-scratch.rst index cedc5e00cc..7080ab9265 100644 --- a/doc/source/admin/zuul-from-scratch.rst +++ b/doc/source/admin/zuul-from-scratch.rst @@ -106,7 +106,7 @@ Add to ``/etc/zuul/zuul.conf``: [connection zuul-git] driver=git - baseurl=https://git.zuul-ci.org/ + baseurl=https://opendev.org/ EOF" Restart executor and scheduler: diff --git a/doc/source/admin/zuul_install.rst b/doc/source/admin/zuul_install.rst index a9cb9c6aa7..3b35c202bd 100644 --- a/doc/source/admin/zuul_install.rst +++ b/doc/source/admin/zuul_install.rst @@ -32,7 +32,7 @@ required. .. code-block:: console # All: - $ git clone https://git.zuul-ci.org/zuul + $ git clone https://opendev.org/zuul/zuul $ pushd zuul/ # For Fedora and CentOS: diff --git a/doc/source/user/vulnerabilities.rst b/doc/source/user/vulnerabilities.rst index 2384ef91f0..d419296553 100644 --- a/doc/source/user/vulnerabilities.rst +++ b/doc/source/user/vulnerabilities.rst @@ -34,8 +34,8 @@ provide risks, concerns or other relevant details in the description field. Where it lists teams and users that can see this story, add the ``zuul-security`` team so they'll be able to work on triaging it. For the initial task, select the project to which this is -specific (e.g., ``openstack-infra/zuul`` or -``openstack-infra/nodepool``) and if it relates to additional +specific (e.g., ``zuul/zuul`` or +``zuul/nodepool``) and if it relates to additional projects you can add another task for each of them making sure to include a relevant title for each task. When you've included all the detail and tasks you want, save the new story and then you can diff --git a/playbooks/quick-start/main.yaml b/playbooks/quick-start/main.yaml index 4aeb1e7f54..649544dce0 100644 --- a/playbooks/quick-start/main.yaml +++ b/playbooks/quick-start/main.yaml @@ -2,7 +2,7 @@ when: not local shell: cmd: docker-compose up -d - chdir: src/git.openstack.org/openstack-infra/zuul/doc/source/admin/examples + chdir: src/opendev.org/zuul/zuul/doc/source/admin/examples become: true - name: Run docker-compose up when: local diff --git a/playbooks/zuul-migrate/post.yaml b/playbooks/zuul-migrate/post.yaml index 2647b7d18d..3ad16bc918 100644 --- a/playbooks/zuul-migrate/post.yaml +++ b/playbooks/zuul-migrate/post.yaml @@ -5,7 +5,7 @@ synchronize: dest: "{{ zuul.executor.log_root }}/openstack-zuul-jobs" mode: pull - src: "src/git.openstack.org/openstack-infra/openstack-zuul-jobs/zuul.d" + src: "src/opendev.org/openstack/openstack-zuul-jobs/zuul.d" verify_host: true no_log: true @@ -13,7 +13,7 @@ synchronize: dest: "{{ zuul.executor.log_root }}/openstack-zuul-jobs" mode: pull - src: "src/git.openstack.org/openstack-infra/project-config/zuul.d" + src: "src/opendev.org/openstack/project-config/zuul.d" verify_host: true no_log: true @@ -21,6 +21,6 @@ synchronize: dest: "{{ zuul.executor.log_root }}/playbooks" mode: pull - src: "src/git.openstack.org/openstack-infra/openstack-zuul-jobs/playbooks/legacy" + src: "src/opendev.org/openstack/openstack-zuul-jobs/playbooks/legacy" verify_host: true no_log: true diff --git a/playbooks/zuul-migrate/run.yaml b/playbooks/zuul-migrate/run.yaml index 2ba81d039e..562dc12356 100644 --- a/playbooks/zuul-migrate/run.yaml +++ b/playbooks/zuul-migrate/run.yaml @@ -2,9 +2,9 @@ tasks: - name: Install migration dependencies - command: "python3 -m pip install --user src/git.openstack.org/openstack-infra/zuul[migrate]" + command: "python3 -m pip install --user src/opendev.org/zuul/zuul[migrate]" - name: Migrate the data command: tools/run-migration.sh -v --final args: - chdir: src/git.openstack.org/openstack-infra/zuul + chdir: src/opendev.org/zuul/zuul diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2 index 4cbc40369a..92d6867c9f 100644 --- a/playbooks/zuul-stream/templates/ansible.cfg.j2 +++ b/playbooks/zuul-stream/templates/ansible.cfg.j2 @@ -2,9 +2,9 @@ inventory = {{ ansible_user_dir }}/inventory.yaml gathering = smart gather_subset = !all -lookup_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/{{ zuul_ansible_version }}/lookup -action_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/{{ zuul_ansible_version }}/actiongeneral:{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action -callback_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/{{ zuul_ansible_version }}/callback:/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/lib/python3.5/site-packages/ara/plugins/callbacks +lookup_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/lookup +action_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/actiongeneral:{{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/action +callback_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/callback:/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/lib/python3.5/site-packages/ara/plugins/callbacks stdout_callback = zuul_stream -library = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/{{ zuul_ansible_version }}/library +library = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/library retry_files_enabled = False diff --git a/tests/fixtures/gerrit/simple_query_pagination_new_1 b/tests/fixtures/gerrit/simple_query_pagination_new_1 index b3fdd83087..873c3865a3 100644 --- a/tests/fixtures/gerrit/simple_query_pagination_new_1 +++ b/tests/fixtures/gerrit/simple_query_pagination_new_1 @@ -1,5 +1,5 @@ -gerrit query --format json --commit-message --current-patch-set project:openstack-infra/zuul -{"project":"openstack-infra/zuul","branch":"master","topic":"(detached","id":"I173251c8b1569755124b7cb1a48b6274bf38c94b","number":"202867","subject":"Report the per-job build wait time to graphite","owner":{"name":"Timothy R. Chavez","email":"timothy.chavez@hp.com","username":"timrchavez"},"url":"https://review.openstack.org/202867","commitMessage":"Report the per-job build wait time to graphite\n\nKnowing how long a job waits to build in aggregate can give useful\ninsights into the performance and capacity of the build system. This\nchange also uses the node labels sent back from the gearman worker to\nsubmit metrics within that context.\n\nChange-Id: I173251c8b1569755124b7cb1a48b6274bf38c94b\nDepends-On: Ibca938fcf8a65facd7e39dab4eb994dfc637722a\n","createdOn":1437104683,"lastUpdated":1440760891,"open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"ignore-deletes","id":"Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6","number":"178833","subject":"Add option to ignore ref-updated events emitted by branch deletions","owner":{"name":"K Jonathan Harker","email":"code@gentlydownthe.net","username":"jesusaurus"},"url":"https://review.openstack.org/178833","commitMessage":"Add option to ignore ref-updated events emitted by branch deletions\n\nWhen a branch is deleted, gerrit emits a ref-updated event with a newrev\nvalue of all zeros. This adds a boolean field to optionally not trigger\non these ref-updated events.\n\nChange-Id: Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6\n","createdOn":1430339761,"lastUpdated":1440735750,"open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"undefined-projects","id":"I7912197fb86c1a7becb7f43ca36078101f632715","number":"207094","subject":"Dependencies from undefined projects","owner":{"name":"Evgeny Antyshev","email":"eantyshev@virtuozzo.com","username":"eantyshev"},"url":"https://review.openstack.org/207094","commitMessage":"Dependencies from undefined projects\n\n3rd party CI layout usually has only a few projects defined,\nso it\u0027s possible that some changes depend on projects\nwhich are unknown to Zuul scheduler.\nThese items had None as a \"item.change.project\", which\nis not handled in many places, for ex. in reconfiguration.\n\nThese cases could be handled by defining these projects in layout\nas \"foreign\" projects: no jobs, no other non-standard attributes.\nChanges to those projects are also dropped, unless\nthey came as dependencies.\n\nChange-Id: I7912197fb86c1a7becb7f43ca36078101f632715\n","createdOn":1438183395,"lastUpdated":1440667433,"open":true,"status":"NEW"} -{"type":"stats","rowCount":3,"runTimeMilliseconds":12,"moreChanges":true} \ No newline at end of file +gerrit query --format json --commit-message --current-patch-set project:zuul/zuul +{"project":"zuul/zuul","branch":"master","topic":"(detached","id":"I173251c8b1569755124b7cb1a48b6274bf38c94b","number":"202867","subject":"Report the per-job build wait time to graphite","owner":{"name":"Timothy R. Chavez","email":"timothy.chavez@hp.com","username":"timrchavez"},"url":"https://review.openstack.org/202867","commitMessage":"Report the per-job build wait time to graphite\n\nKnowing how long a job waits to build in aggregate can give useful\ninsights into the performance and capacity of the build system. This\nchange also uses the node labels sent back from the gearman worker to\nsubmit metrics within that context.\n\nChange-Id: I173251c8b1569755124b7cb1a48b6274bf38c94b\nDepends-On: Ibca938fcf8a65facd7e39dab4eb994dfc637722a\n","createdOn":1437104683,"lastUpdated":1440760891,"open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"ignore-deletes","id":"Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6","number":"178833","subject":"Add option to ignore ref-updated events emitted by branch deletions","owner":{"name":"K Jonathan Harker","email":"code@gentlydownthe.net","username":"jesusaurus"},"url":"https://review.openstack.org/178833","commitMessage":"Add option to ignore ref-updated events emitted by branch deletions\n\nWhen a branch is deleted, gerrit emits a ref-updated event with a newrev\nvalue of all zeros. This adds a boolean field to optionally not trigger\non these ref-updated events.\n\nChange-Id: Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6\n","createdOn":1430339761,"lastUpdated":1440735750,"open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"undefined-projects","id":"I7912197fb86c1a7becb7f43ca36078101f632715","number":"207094","subject":"Dependencies from undefined projects","owner":{"name":"Evgeny Antyshev","email":"eantyshev@virtuozzo.com","username":"eantyshev"},"url":"https://review.openstack.org/207094","commitMessage":"Dependencies from undefined projects\n\n3rd party CI layout usually has only a few projects defined,\nso it\u0027s possible that some changes depend on projects\nwhich are unknown to Zuul scheduler.\nThese items had None as a \"item.change.project\", which\nis not handled in many places, for ex. in reconfiguration.\n\nThese cases could be handled by defining these projects in layout\nas \"foreign\" projects: no jobs, no other non-standard attributes.\nChanges to those projects are also dropped, unless\nthey came as dependencies.\n\nChange-Id: I7912197fb86c1a7becb7f43ca36078101f632715\n","createdOn":1438183395,"lastUpdated":1440667433,"open":true,"status":"NEW"} +{"type":"stats","rowCount":3,"runTimeMilliseconds":12,"moreChanges":true} diff --git a/tests/fixtures/gerrit/simple_query_pagination_new_2 b/tests/fixtures/gerrit/simple_query_pagination_new_2 index 9fd8d54adb..2d1c472142 100644 --- a/tests/fixtures/gerrit/simple_query_pagination_new_2 +++ b/tests/fixtures/gerrit/simple_query_pagination_new_2 @@ -1,4 +1,4 @@ -gerrit query --format json --commit-message --current-patch-set project:openstack-infra/zuul -S 3 -{"project":"openstack-infra/zuul","branch":"master","topic":"github-integration","id":"I95f41088ea160d4e33a507c4a413e3fa7f08906b","number":"192457","subject":"(WIP) Fix job hierarchy bug.","owner":{"name":"Wayne Warren","email":"waynr+launchpad@sdf.org","username":"waynr"},"url":"https://review.openstack.org/192457","commitMessage":"(WIP) Fix job hierarchy bug.\n\nJobTree.addJob may return \u0027None\u0027, this prevents that from happening.\n\nChange-Id: I95f41088ea160d4e33a507c4a413e3fa7f08906b\n","createdOn":1434498278,"lastUpdated":1440608984,"sortKey":"003763050002efc9","open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"github-integration","id":"Ic5887d00ff302f67469df5154e9df10b99f1cfcd","number":"215642","subject":"(WIP) Allow using webapp from connections","owner":{"name":"Jan Hruban","email":"jan.hruban@gooddata.com","username":"hrubi"},"url":"https://review.openstack.org/215642","commitMessage":"(WIP) Allow using webapp from connections\n\nAllow connections to register their own handlers for HTTP URIs inside\nthe zuul\u0027s webapp HTTP server. That way, connections can listen for\nevents comming through HTTP.\n\nChange-Id: Ic5887d00ff302f67469df5154e9df10b99f1cfcd\n","createdOn":1440165019,"lastUpdated":1440602591,"sortKey":"0037629b00034a5a","open":true,"status":"NEW"} -{"type":"stats","rowCount":2,"runTimeMilliseconds":12,"moreChanges":false} \ No newline at end of file +gerrit query --format json --commit-message --current-patch-set project:zuul/zuul -S 3 +{"project":"zuul/zuul","branch":"master","topic":"github-integration","id":"I95f41088ea160d4e33a507c4a413e3fa7f08906b","number":"192457","subject":"(WIP) Fix job hierarchy bug.","owner":{"name":"Wayne Warren","email":"waynr+launchpad@sdf.org","username":"waynr"},"url":"https://review.openstack.org/192457","commitMessage":"(WIP) Fix job hierarchy bug.\n\nJobTree.addJob may return \u0027None\u0027, this prevents that from happening.\n\nChange-Id: I95f41088ea160d4e33a507c4a413e3fa7f08906b\n","createdOn":1434498278,"lastUpdated":1440608984,"sortKey":"003763050002efc9","open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"github-integration","id":"Ic5887d00ff302f67469df5154e9df10b99f1cfcd","number":"215642","subject":"(WIP) Allow using webapp from connections","owner":{"name":"Jan Hruban","email":"jan.hruban@gooddata.com","username":"hrubi"},"url":"https://review.openstack.org/215642","commitMessage":"(WIP) Allow using webapp from connections\n\nAllow connections to register their own handlers for HTTP URIs inside\nthe zuul\u0027s webapp HTTP server. That way, connections can listen for\nevents comming through HTTP.\n\nChange-Id: Ic5887d00ff302f67469df5154e9df10b99f1cfcd\n","createdOn":1440165019,"lastUpdated":1440602591,"sortKey":"0037629b00034a5a","open":true,"status":"NEW"} +{"type":"stats","rowCount":2,"runTimeMilliseconds":12,"moreChanges":false} diff --git a/tests/fixtures/gerrit/simple_query_pagination_old_1 b/tests/fixtures/gerrit/simple_query_pagination_old_1 index 8ff1710115..391f1249e3 100644 --- a/tests/fixtures/gerrit/simple_query_pagination_old_1 +++ b/tests/fixtures/gerrit/simple_query_pagination_old_1 @@ -1,5 +1,5 @@ -gerrit query --format json --commit-message --current-patch-set project:openstack-infra/zuul -{"project":"openstack-infra/zuul","branch":"master","topic":"(detached","id":"I173251c8b1569755124b7cb1a48b6274bf38c94b","number":"202867","subject":"Report the per-job build wait time to graphite","owner":{"name":"Timothy R. Chavez","email":"timothy.chavez@hp.com","username":"timrchavez"},"url":"https://review.openstack.org/202867","commitMessage":"Report the per-job build wait time to graphite\n\nKnowing how long a job waits to build in aggregate can give useful\ninsights into the performance and capacity of the build system. This\nchange also uses the node labels sent back from the gearman worker to\nsubmit metrics within that context.\n\nChange-Id: I173251c8b1569755124b7cb1a48b6274bf38c94b\nDepends-On: Ibca938fcf8a65facd7e39dab4eb994dfc637722a\n","createdOn":1437104683,"lastUpdated":1440760891,"sortKey":"00376ce900031873","open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"ignore-deletes","id":"Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6","number":"178833","subject":"Add option to ignore ref-updated events emitted by branch deletions","owner":{"name":"K Jonathan Harker","email":"code@gentlydownthe.net","username":"jesusaurus"},"url":"https://review.openstack.org/178833","commitMessage":"Add option to ignore ref-updated events emitted by branch deletions\n\nWhen a branch is deleted, gerrit emits a ref-updated event with a newrev\nvalue of all zeros. This adds a boolean field to optionally not trigger\non these ref-updated events.\n\nChange-Id: Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6\n","createdOn":1430339761,"lastUpdated":1440735750,"sortKey":"00376b460002ba91","open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"undefined-projects","id":"I7912197fb86c1a7becb7f43ca36078101f632715","number":"207094","subject":"Dependencies from undefined projects","owner":{"name":"Evgeny Antyshev","email":"eantyshev@virtuozzo.com","username":"eantyshev"},"url":"https://review.openstack.org/207094","commitMessage":"Dependencies from undefined projects\n\n3rd party CI layout usually has only a few projects defined,\nso it\u0027s possible that some changes depend on projects\nwhich are unknown to Zuul scheduler.\nThese items had None as a \"item.change.project\", which\nis not handled in many places, for ex. in reconfiguration.\n\nThese cases could be handled by defining these projects in layout\nas \"foreign\" projects: no jobs, no other non-standard attributes.\nChanges to those projects are also dropped, unless\nthey came as dependencies.\n\nChange-Id: I7912197fb86c1a7becb7f43ca36078101f632715\n","createdOn":1438183395,"lastUpdated":1440667433,"sortKey":"003766d3000328f6","open":true,"status":"NEW"} -{"type":"stats","rowCount":3,"runTimeMilliseconds":12} \ No newline at end of file +gerrit query --format json --commit-message --current-patch-set project:zuul/zuul +{"project":"zuul/zuul","branch":"master","topic":"(detached","id":"I173251c8b1569755124b7cb1a48b6274bf38c94b","number":"202867","subject":"Report the per-job build wait time to graphite","owner":{"name":"Timothy R. Chavez","email":"timothy.chavez@hp.com","username":"timrchavez"},"url":"https://review.openstack.org/202867","commitMessage":"Report the per-job build wait time to graphite\n\nKnowing how long a job waits to build in aggregate can give useful\ninsights into the performance and capacity of the build system. This\nchange also uses the node labels sent back from the gearman worker to\nsubmit metrics within that context.\n\nChange-Id: I173251c8b1569755124b7cb1a48b6274bf38c94b\nDepends-On: Ibca938fcf8a65facd7e39dab4eb994dfc637722a\n","createdOn":1437104683,"lastUpdated":1440760891,"sortKey":"00376ce900031873","open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"ignore-deletes","id":"Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6","number":"178833","subject":"Add option to ignore ref-updated events emitted by branch deletions","owner":{"name":"K Jonathan Harker","email":"code@gentlydownthe.net","username":"jesusaurus"},"url":"https://review.openstack.org/178833","commitMessage":"Add option to ignore ref-updated events emitted by branch deletions\n\nWhen a branch is deleted, gerrit emits a ref-updated event with a newrev\nvalue of all zeros. This adds a boolean field to optionally not trigger\non these ref-updated events.\n\nChange-Id: Iea75d05ddcb49b0bf748b72b9d2d5472d077f0c6\n","createdOn":1430339761,"lastUpdated":1440735750,"sortKey":"00376b460002ba91","open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"undefined-projects","id":"I7912197fb86c1a7becb7f43ca36078101f632715","number":"207094","subject":"Dependencies from undefined projects","owner":{"name":"Evgeny Antyshev","email":"eantyshev@virtuozzo.com","username":"eantyshev"},"url":"https://review.openstack.org/207094","commitMessage":"Dependencies from undefined projects\n\n3rd party CI layout usually has only a few projects defined,\nso it\u0027s possible that some changes depend on projects\nwhich are unknown to Zuul scheduler.\nThese items had None as a \"item.change.project\", which\nis not handled in many places, for ex. in reconfiguration.\n\nThese cases could be handled by defining these projects in layout\nas \"foreign\" projects: no jobs, no other non-standard attributes.\nChanges to those projects are also dropped, unless\nthey came as dependencies.\n\nChange-Id: I7912197fb86c1a7becb7f43ca36078101f632715\n","createdOn":1438183395,"lastUpdated":1440667433,"sortKey":"003766d3000328f6","open":true,"status":"NEW"} +{"type":"stats","rowCount":3,"runTimeMilliseconds":12} diff --git a/tests/fixtures/gerrit/simple_query_pagination_old_2 b/tests/fixtures/gerrit/simple_query_pagination_old_2 index c55cd4009a..9099a874b6 100644 --- a/tests/fixtures/gerrit/simple_query_pagination_old_2 +++ b/tests/fixtures/gerrit/simple_query_pagination_old_2 @@ -1,4 +1,4 @@ -gerrit query --format json --commit-message --current-patch-set project:openstack-infra/zuul resume_sortkey:'003766d3000328f6' -{"project":"openstack-infra/zuul","branch":"master","topic":"github-integration","id":"I95f41088ea160d4e33a507c4a413e3fa7f08906b","number":"192457","subject":"(WIP) Fix job hierarchy bug.","owner":{"name":"Wayne Warren","email":"waynr+launchpad@sdf.org","username":"waynr"},"url":"https://review.openstack.org/192457","commitMessage":"(WIP) Fix job hierarchy bug.\n\nJobTree.addJob may return \u0027None\u0027, this prevents that from happening.\n\nChange-Id: I95f41088ea160d4e33a507c4a413e3fa7f08906b\n","createdOn":1434498278,"lastUpdated":1440608984,"sortKey":"003763050002efc9","open":true,"status":"NEW"} -{"project":"openstack-infra/zuul","branch":"master","topic":"github-integration","id":"Ic5887d00ff302f67469df5154e9df10b99f1cfcd","number":"215642","subject":"(WIP) Allow using webapp from connections","owner":{"name":"Jan Hruban","email":"jan.hruban@gooddata.com","username":"hrubi"},"url":"https://review.openstack.org/215642","commitMessage":"(WIP) Allow using webapp from connections\n\nAllow connections to register their own handlers for HTTP URIs inside\nthe zuul\u0027s webapp HTTP server. That way, connections can listen for\nevents comming through HTTP.\n\nChange-Id: Ic5887d00ff302f67469df5154e9df10b99f1cfcd\n","createdOn":1440165019,"lastUpdated":1440602591,"sortKey":"0037629b00034a5a","open":true,"status":"NEW"} -{"type":"stats","rowCount":2,"runTimeMilliseconds":12} \ No newline at end of file +gerrit query --format json --commit-message --current-patch-set project:zuul/zuul resume_sortkey:'003766d3000328f6' +{"project":"zuul/zuul","branch":"master","topic":"github-integration","id":"I95f41088ea160d4e33a507c4a413e3fa7f08906b","number":"192457","subject":"(WIP) Fix job hierarchy bug.","owner":{"name":"Wayne Warren","email":"waynr+launchpad@sdf.org","username":"waynr"},"url":"https://review.openstack.org/192457","commitMessage":"(WIP) Fix job hierarchy bug.\n\nJobTree.addJob may return \u0027None\u0027, this prevents that from happening.\n\nChange-Id: I95f41088ea160d4e33a507c4a413e3fa7f08906b\n","createdOn":1434498278,"lastUpdated":1440608984,"sortKey":"003763050002efc9","open":true,"status":"NEW"} +{"project":"zuul/zuul","branch":"master","topic":"github-integration","id":"Ic5887d00ff302f67469df5154e9df10b99f1cfcd","number":"215642","subject":"(WIP) Allow using webapp from connections","owner":{"name":"Jan Hruban","email":"jan.hruban@gooddata.com","username":"hrubi"},"url":"https://review.openstack.org/215642","commitMessage":"(WIP) Allow using webapp from connections\n\nAllow connections to register their own handlers for HTTP URIs inside\nthe zuul\u0027s webapp HTTP server. That way, connections can listen for\nevents comming through HTTP.\n\nChange-Id: Ic5887d00ff302f67469df5154e9df10b99f1cfcd\n","createdOn":1440165019,"lastUpdated":1440602591,"sortKey":"0037629b00034a5a","open":true,"status":"NEW"} +{"type":"stats","rowCount":2,"runTimeMilliseconds":12} diff --git a/tests/fixtures/gerrit/simple_query_pagination_old_3 b/tests/fixtures/gerrit/simple_query_pagination_old_3 index b8cdc4a552..258946f74b 100644 --- a/tests/fixtures/gerrit/simple_query_pagination_old_3 +++ b/tests/fixtures/gerrit/simple_query_pagination_old_3 @@ -1,2 +1,2 @@ -gerrit query --format json --commit-message --current-patch-set project:openstack-infra/zuul resume_sortkey:'0037629b00034a5a' -{"type":"stats","rowCount":0,"runTimeMilliseconds":12} \ No newline at end of file +gerrit query --format json --commit-message --current-patch-set project:zuul/zuul resume_sortkey:'0037629b00034a5a' +{"type":"stats","rowCount":0,"runTimeMilliseconds":12} diff --git a/tests/unit/test_gerrit.py b/tests/unit/test_gerrit.py index c3a9298b32..f52c539592 100644 --- a/tests/unit/test_gerrit.py +++ b/tests/unit/test_gerrit.py @@ -56,7 +56,7 @@ class TestGerrit(BaseTestCase): calls, values = read_fixtures(files) _ssh_mock.side_effect = values - result = gerrit.simpleQuery('project:openstack-infra/zuul') + result = gerrit.simpleQuery('project:zuul/zuul') _ssh_mock.assert_has_calls(calls) self.assertEqual(len(calls), _ssh_mock.call_count, diff --git a/tox.ini b/tox.ini index e736a7c6c8..6262023014 100644 --- a/tox.ini +++ b/tox.ini @@ -91,7 +91,7 @@ commands = stestr run --test-path ./tests/remote {posargs} [flake8] -# These are ignored intentionally in openstack-infra projects; +# These are ignored intentionally in zuul projects; # please don't submit patches that solely correct them or enable them. ignore = E124,E125,E129,E252,E402,E741,H,W503,W504 show-source = True diff --git a/web/package.json b/web/package.json index 35aa258a84..fd3425ccef 100644 --- a/web/package.json +++ b/web/package.json @@ -2,7 +2,7 @@ "name": "@zuul-ci/dashboard", "version": "1.0.0", "description": "Zuul Web Dashboard", - "repository": "https://git.zuul-ci.org/zuul", + "repository": "https://opendev.org/zuul/zuul", "author": "Zuul Developers", "license": "Apache-2.0", "private": true,