diff --git a/playbooks/zuul/gerrit/repos.yaml b/playbooks/zuul/gerrit/repos.yaml index 6afc5301e1..79730ca569 100644 --- a/playbooks/zuul/gerrit/repos.yaml +++ b/playbooks/zuul/gerrit/repos.yaml @@ -15,16 +15,6 @@ - unzip state: present - # Until Gerrit 3.5 we need to work around scripts looking for bare - # python instead of python3. - # https://gerrit-review.googlesource.com/c/gerrit/+/298903 - - name: Install python symlink - become: true - ansible.builtin.file: - src: /usr/bin/python3 - dest: /usr/bin/python - state: link - - name: Move common plugin repos into gerrit tree command: "mv -f {{ item }} ../gerrit/plugins" args: diff --git a/playbooks/zuul/gerrit/submodules.yaml b/playbooks/zuul/gerrit/submodules.yaml index 155bf145e5..ed282d6c36 100644 --- a/playbooks/zuul/gerrit/submodules.yaml +++ b/playbooks/zuul/gerrit/submodules.yaml @@ -6,5 +6,6 @@ args: chdir: /home/zuul/src/gerrit.googlesource.com/gerrit loop: + - modules/java-prettify - modules/jgit - polymer-bridges diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index aa49d31ee8..cad6c02cd5 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -136,6 +136,99 @@ vars: *gerrit_vars_3_8 files: *gerrit_files_3_8 +# Gerrit 3.9 jobs +- job: + name: system-config-build-image-gerrit-3.9 + description: Build a gerrit image. + parent: system-config-build-image + pre-run: + - playbooks/zuul/gerrit/repos.yaml + - playbooks/zuul/gerrit/submodules.yaml + run: playbooks/zuul/gerrit/run.yaml + requires: gerrit-base-container-image + provides: gerrit-3.9-container-image + required-projects: &gerrit_projects_3_9 + - name: opendev/system-config + override-checkout: master + - name: gerrit.googlesource.com/gerrit + override-checkout: stable-3.9 + # Backend behavior plugins + - name: gerrit.googlesource.com/plugins/commit-message-length-validator + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/hooks + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/its-base + # There is no 3.9 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/its-storyboard + # There is no 3.9 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/plugin-manager + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/replication + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/reviewnotes + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/singleusergroup + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/webhooks + override-checkout: v3.9.1 + # UI behavior plugins + - name: gerrit.googlesource.com/plugins/codemirror-editor + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/download-commands + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/gitiles + override-checkout: v3.9.1 + - name: gerrit.googlesource.com/plugins/zuul-results-summary + override-checkout: main + # Non plugin submodules + - name: gerrit.googlesource.com/java-prettify + override-checkout: master + - name: gerrit.googlesource.com/jgit + override-checkout: master + - name: gerrit.googlesource.com/polymer-bridges + override-checkout: v3.9.1 + vars: &gerrit_vars_3_9 + docker_images: + - context: docker/gerrit/bazel + repository: opendevorg/gerrit + target: gerrit + path: /home/zuul/src/gerrit.googlesource.com/gerrit + tags: + - 3.9 + files: &gerrit_files_3_9 + - docker/gerrit/base/ + - docker/gerrit/bazel/ + - playbooks/zuul/gerrit/ + - playbooks/test-review.yaml + - testinfra/test_gerrit.py + - jeepyb/ + - roles/bazelisk-build/ + +- job: + name: system-config-upload-image-gerrit-3.9 + description: Build and upload a gerrit image. + parent: system-config-upload-image + pre-run: + - playbooks/zuul/gerrit/repos.yaml + - playbooks/zuul/gerrit/submodules.yaml + run: playbooks/zuul/gerrit/run.yaml + requires: gerrit-base-container-image + provides: gerrit-3.9-container-image + required-projects: *gerrit_projects_3_9 + vars: *gerrit_vars_3_9 + files: *gerrit_files_3_9 + +- job: + name: system-config-promote-image-gerrit-3.9 + description: Promote a previously published gerrit image to latest. + parent: system-config-promote-image + vars: *gerrit_vars_3_9 + files: *gerrit_files_3_9 + # Gerrit master jobs - job: name: system-config-build-image-gerrit-master-base @@ -171,6 +264,8 @@ - gerrit.googlesource.com/plugins/gitiles - name: gerrit.googlesource.com/plugins/zuul-results-summary override-checkout: main + # Non plugin submodules + - gerrit.googlesource.com/java-prettify - gerrit.googlesource.com/jgit - gerrit.googlesource.com/polymer-bridges vars: &gerrit_vars_master @@ -234,6 +329,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-base soft: true + - system-config-build-image-gerrit-3.9: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-base + soft: true - system-config-build-image-gerrit-master: voting: false dependencies: @@ -252,7 +352,13 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-base soft: true + - system-config-upload-image-gerrit-3.9: + dependencies: + - name: opendev-buildset-registry + - name: system-config-upload-image-gerrit-base + soft: true deploy: jobs: - system-config-promote-image-gerrit-base - system-config-promote-image-gerrit-3.8 + - system-config-promote-image-gerrit-3.9 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a94ec2eb19..d64c5acd6c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -69,6 +69,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.8 soft: true + - system-config-run-review-3.9: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-3.9 + soft: true #- system-config-upgrade-review: # dependencies: # - name: opendev-buildset-registry @@ -228,6 +233,11 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-3.8 soft: true + - system-config-run-review-3.9: + dependencies: + - name: opendev-buildset-registry + - name: system-config-upload-image-gerrit-3.9 + soft: true - system-config-run-refstack: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 5eb47b5ba3..a23a0c1846 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1085,6 +1085,15 @@ vars: zuul_test_gerrit_version: '3.8' +- job: + name: system-config-run-review-3.9 + parent: system-config-run-review-base + description: | + Run the playbook for gerrit 3.9 (in a container). + requires: gerrit-3.9-container-image + vars: + zuul_test_gerrit_version: '3.9' + #- job: # name: system-config-upgrade-review # parent: system-config-run-review-base