zuul/nodepool: bump to the latest version
This change sets the ansible_root zuul.conf variable to
avoid ansible installation on startup.
This change also updates the pipeline definition according
to the one from https://opendev.org/zuul/project-config .
Change-Id: I055d0f90cbf5d4dd9799e0f377d385ebb31e7127
diff --git a/ansible/roles/sf-nodepool/defaults/main.yml b/ansible/roles/sf-nodepool/defaults/main.yml
index 83da693..c719722 100644
--- a/ansible/roles/sf-nodepool/defaults/main.yml
+++ b/ansible/roles/sf-nodepool/defaults/main.yml
@@ -16,7 +16,7 @@
dib_upstream_elements: True
-nodepool_version: 8.1.0
+nodepool_version: 9.0.0
nodepool_container_version: "{{ nodepool_version }}-1"
nodepool_services:
@@ -35,7 +35,7 @@
nodepool_components:
- service: "nodepool-launcher"
- image: "quay.io/software-factory/nodepool-launcher-ubi:{{ nodepool_container_version }}"
+ image: "quay.io/software-factory/nodepool-launcher-sf38:{{ nodepool_container_version }}"
run: >-
/usr/local/bin/nodepool-launcher -d
-c /etc/nodepool/nodepool.yaml
@@ -61,7 +61,7 @@
{{ sf_nodepool_launcher_additional_params }}
{% endif %}
- service: "nodepool-builder"
- image: "quay.io/software-factory/nodepool-builder-ubi:{{ nodepool_container_version }}"
+ image: "quay.io/software-factory/nodepool-builder-sf38:{{ nodepool_container_version }}"
run: >-
/usr/local/bin/nodepool-builder -d
-c /etc/nodepool/nodepool.yaml
diff --git a/ansible/roles/sf-repos/templates/config/zuul.d/_pipelines.yaml.j2 b/ansible/roles/sf-repos/templates/config/zuul.d/_pipelines.yaml.j2
index e687f19..1679403 100644
--- a/ansible/roles/sf-repos/templates/config/zuul.d/_pipelines.yaml.j2
+++ b/ansible/roles/sf-repos/templates/config/zuul.d/_pipelines.yaml.j2
@@ -30,13 +30,7 @@
- event: patchset-created
- event: change-restored
- event: comment-added
- comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify)
- - event: comment-added
- require-approval:
- - Verified: [-1, -2]
- username: zuul
- approval:
- - Workflow: 1
+ comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck
{% endfor %}
{% for github_connection in zuul_github_connections_pipelines %}
{{ github_connection.name }}:
@@ -221,6 +215,8 @@
approval:
- Verified: 1
username: zuul
+ - event: comment-added
+ comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*reverify
{% endfor %}
{% for github_connection in zuul_github_connections_pipelines %}{% if github_connection.app_name|default(False) %}
{{ github_connection.name }}:
diff --git a/ansible/roles/sf-zuul/defaults/main.yml b/ansible/roles/sf-zuul/defaults/main.yml
index e301d5d..925d907 100644
--- a/ansible/roles/sf-zuul/defaults/main.yml
+++ b/ansible/roles/sf-zuul/defaults/main.yml
@@ -21,8 +21,8 @@
zuul_log_dir: "/var/log/zuul"
zuul_share_dir: "/usr/share/javascript/zuul"
-zuul_version: "8.1.0"
-zuul_container_version: "{{ zuul_version }}-1"
+zuul_version: "9.1.0"
+zuul_container_version: "{{ zuul_version }}-4"
zuul_client_version: "f96ddd00fc69d8a4d51eb207ef322b99983d1fe8"
zuul_client_container_version: "0.1.0-{{ zuul_client_version }}-1"
@@ -37,7 +37,7 @@
zuul_components:
- service: "zuul-scheduler"
- image: "quay.io/software-factory/zuul-scheduler-ubi:{{ zuul_container_version }}"
+ image: "quay.io/software-factory/zuul-scheduler-sf38:{{ zuul_container_version }}"
params: >-
{{ zuul_components_default_params }}
--volume /var/lib/zuul/:/var/lib/zuul/:z
@@ -45,7 +45,7 @@
{{ sf_zuul_scheduler_additional_params }}
{% endif %}
- service: "zuul-executor"
- image: "quay.io/software-factory/zuul-executor-ubi:{{ zuul_container_version }}"
+ image: "quay.io/software-factory/zuul-executor-sf38:{{ zuul_container_version }}"
params: >-
{{ zuul_components_default_params }}
--volume {{ zuul_lib_dir }}/:{{ zuul_lib_dir }}/:z
@@ -58,14 +58,14 @@
{{ sf_zuul_executor_additional_params }}
{% endif %}
- service: "zuul-fingergw"
- image: "quay.io/software-factory/zuul-fingergw-ubi:{{ zuul_container_version }}"
+ image: "quay.io/software-factory/zuul-fingergw-sf38:{{ zuul_container_version }}"
params: >-
{{ zuul_components_default_params }}
{% if sf_zuul_fingergw_additional_params is defined %}
{{ sf_zuul_fingergw_additional_params }}
{% endif %}
- service: "zuul-merger"
- image: "quay.io/software-factory/zuul-merger-ubi:{{ zuul_container_version }}"
+ image: "quay.io/software-factory/zuul-merger-sf38:{{ zuul_container_version }}"
params: >-
{{ zuul_components_default_params }}
--volume {{ zuul_lib_dir }}/:{{ zuul_lib_dir }}/:z
@@ -73,7 +73,7 @@
{{ sf_zuul_merger_additional_params }}
{% endif %}
- service: "zuul-web"
- image: "quay.io/software-factory/zuul-web-ubi:{{ zuul_container_version }}"
+ image: "quay.io/software-factory/zuul-web-sf38:{{ zuul_container_version }}"
params: >-
{{ zuul_components_default_params }}
{% if sf_zuul_web_additional_params is defined %}
diff --git a/ansible/roles/sf-zuul/tasks/setup.yml b/ansible/roles/sf-zuul/tasks/setup.yml
index 9751778..dcd1148 100644
--- a/ansible/roles/sf-zuul/tasks/setup.yml
+++ b/ansible/roles/sf-zuul/tasks/setup.yml
@@ -112,7 +112,7 @@
exec podman run -it --rm --network host --user root \
--volume /etc/zuul/:/etc/zuul/:Z \
--volume /var/lib/zuul/:/var/lib/zuul/:Z \
- quay.io/software-factory/zuul-scheduler-ubi:{{ zuul_container_version }} zuul $*
+ quay.io/software-factory/zuul-scheduler-sf38:{{ zuul_container_version }} zuul $*
- block:
- name: Ensure known_hosts file exists
diff --git a/ansible/roles/sf-zuul/templates/zuul.conf.j2 b/ansible/roles/sf-zuul/templates/zuul.conf.j2
index 0c77eca..6fb44b8 100644
--- a/ansible/roles/sf-zuul/templates/zuul.conf.j2
+++ b/ansible/roles/sf-zuul/templates/zuul.conf.j2
@@ -36,7 +36,8 @@
{% if 'zuul-executor' in roles %}
[executor]
ansible_setup_timeout={{ zuul_executor_ansible_setup_timeout|default(60) }}
-manage_ansible=true
+manage_ansible=false
+ansible_root=/usr/lib/zuul/ansible/
state_dir={{ zuul_lib_dir }}
command_socket={{ zuul_lib_dir }}/executor.socket
git_dir={{ zuul_lib_dir }}/executor/