From 5f410a4ae9b4188942a44e1c775f11691b0a1117 Mon Sep 17 00:00:00 2001 From: Zuul CI Bot (Fabien Boucher) Date: Mar 24 2021 15:23:19 +0000 Subject: Merge #139 `Automatic update of defaults` --- diff --git a/playbooks/base/post.yaml b/playbooks/base/post.yaml index b316f29..87e2e13 100644 --- a/playbooks/base/post.yaml +++ b/playbooks/base/post.yaml @@ -24,7 +24,7 @@ # This depends-on https://review.openstack.org/577675 ara_report_run: True ara_report_type: database - ara_report_path: ara-report + ara_report_path: "{{ zuul.executor.log_root }}/ara-report" - hosts: "{{ site_sflogs.fqdn }}" gather_facts: false @@ -38,3 +38,9 @@ zuul_log_url: "https://fedora.softwarefactory-project.io/logs" zuul_logserver_root: "{{ site_sflogs.path }}" +- hosts: localhost + ignore_errors: yes + roles: + - role: submit-logstash-jobs + logstash_gearman_server: "fedora.softwarefactory-project.io" + logstash_gearman_server_port: 4731 diff --git a/playbooks/config/check.yaml b/playbooks/config/check.yaml index 34fd530..5280c11 100644 --- a/playbooks/config/check.yaml +++ b/playbooks/config/check.yaml @@ -85,12 +85,6 @@ chdir: "{{ config_root }}" when: '"gerrit" in arch.roles' - - name: Check dashboards - command: python3 /usr/libexec/software-factory/sf-update-dashboard --check --input dashboards/ - args: - chdir: "{{ config_root }}" - when: '"gerrit" in arch.roles' - - name: Check policy file command: python3 -c "import yaml; yaml.safe_load(open('policies/policy.yaml'))" args: @@ -105,6 +99,15 @@ chdir: "{{ config_root }}" when: '"repoxplorer" in arch.roles' + - name: Check nodepool dhall configuration + shell: | + for dhall_conf in $(ls nodepool/*.dhall 2> /dev/null); do + echo ${dhall_conf} + dhall-to-yaml --file ${dhall_conf} --output build/$(basename ${dhall_conf} .dhall).yaml || exit 1 + done + args: + chdir: "{{ config_root }}" + - name: Validate nodepool configuration block: - name: Install defconf nodepool.yaml @@ -155,7 +158,14 @@ config-validate args: chdir: "{{ config_root }}" - when: '"nodepool-launcher" in arch.roles' + + - name: Run nodepool config-validate for static configuration + command: > + env - find nodepool/static_config/ -name '*.yaml' -exec /bin/nodepool -c {} config-validate \; + args: + chdir: "{{ config_root }}" + when: + - '"nodepool-launcher" in arch.roles' - name: Validate zuul configuration block: diff --git a/resources/_internal.yaml b/resources/_internal.yaml index 5438604..5837e8c 100644 --- a/resources/_internal.yaml +++ b/resources/_internal.yaml @@ -22,3 +22,4 @@ resources: connection: gerrit zuul/include: [job] zuul/shadow: fedora-zuul-jobs + hound/skip: True diff --git a/roles/fetch-output-openshift/tasks/rsync.yaml b/roles/fetch-output-openshift/tasks/rsync.yaml index b015270..0f25933 100644 --- a/roles/fetch-output-openshift/tasks/rsync.yaml +++ b/roles/fetch-output-openshift/tasks/rsync.yaml @@ -19,7 +19,7 @@ rsync -q --progress=false {{ item.1.pod }}:{{ output.src }}/ {{ output.dst }}/ - no_log: yes + no_log: true delegate_to: localhost loop: - src: "{{ zuul_output_dir }}/logs" diff --git a/zuul.d/_pipelines.yaml b/zuul.d/_pipelines.yaml index 87bdd58..892c850 100644 --- a/zuul.d/_pipelines.yaml +++ b/zuul.d/_pipelines.yaml @@ -67,6 +67,7 @@ status: 'success' status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}" sqlreporter: + elasticsearch: failure: pagure.io: status: 'failure' @@ -78,6 +79,7 @@ status: 'failure' status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}" sqlreporter: + elasticsearch: failure-message: Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci @@ -183,6 +185,7 @@ status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}" comment: true sqlreporter: + elasticsearch: failure: pagure.io: status: 'failure' @@ -197,6 +200,7 @@ status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}" comment: true sqlreporter: + elasticsearch: failure-message: Build failed (gate pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci window-floor: 20 @@ -220,12 +224,14 @@ ref: ^refs/heads/.*$ success: sqlreporter: + elasticsearch: failure: smtp: from: "zuul@fedora.softwarefactory-project.io" to: "root@localhost" subject: '[Zuul] Job failed in post pipeline: {change.project}' sqlreporter: + elasticsearch: - pipeline: name: tag @@ -245,12 +251,14 @@ ref: ^refs/tags/.*$ success: sqlreporter: + elasticsearch: failure: smtp: from: "zuul@fedora.softwarefactory-project.io" to: "root@localhost" subject: '[Zuul] Job failed in tag pipeline: {change.project}' sqlreporter: + elasticsearch: - pipeline: name: promote @@ -288,6 +296,7 @@ github.com: status: success sqlreporter: + elasticsearch: failure: pagure.io: comment: true @@ -296,6 +305,7 @@ github.com: status: failure sqlreporter: + elasticsearch: failure-message: Build failed (promote pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci @@ -310,12 +320,14 @@ - time: '0 0 * * *' success: sqlreporter: + elasticsearch: failure: smtp: from: "zuul@fedora.softwarefactory-project.io" to: "root@localhost" subject: '[Zuul] Job failed in periodic pipeline: {change.project}' sqlreporter: + elasticsearch: - pipeline: name: experimental @@ -341,10 +353,12 @@ pagure.io: {} src.fedoraproject.org: {} sqlreporter: + elasticsearch: failure: github.com: {} pagure.io: {} src.fedoraproject.org: {} sqlreporter: + elasticsearch: failure-message: Build failed (experimental pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci