Remove some base jobs
These are now in opendev/base-jobs and can be removed from this repo. The site_logs secret is defined in opendev/base-jobs, so for the cases where we are using it to publish things other than logs, duplicate it and rename it. A couple of base jobs remain and use it as their logs secret, so rename it for those cases, until we remove them to opendev/base-jobs as well. Change-Id: If3d281c657f50b82ec57fe8649fef6653b7ceec5
This commit is contained in:
James E. Blair
parent
586bb89f60
commit
90f28117d3
|
|
@ -1,19 +0,0 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: add-fileserver
|
||||
fileserver: "{{ site_logs }}"
|
||||
- role: ara-report
|
||||
|
||||
- hosts: "{{ site_logs.fqdn }}"
|
||||
gather_facts: False
|
||||
roles:
|
||||
- role: upload-logs
|
||||
zuul_log_url: "http://logs.openstack.org"
|
||||
|
||||
- hosts: localhost
|
||||
# NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
|
||||
# successful jobs.
|
||||
ignore_errors: yes
|
||||
roles:
|
||||
- submit-logstash-jobs
|
||||
- submit-subunit-jobs
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
- hosts: all
|
||||
roles:
|
||||
- fetch-output
|
||||
- merge-output-to-logs
|
||||
|
||||
- hosts: all
|
||||
# NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
|
||||
# successful jobs.
|
||||
ignore_errors: yes
|
||||
roles:
|
||||
- remove-build-sshkey
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: emit-job-header
|
||||
zuul_log_url: "http://logs.openstack.org"
|
||||
|
||||
- hosts: all
|
||||
pre_tasks:
|
||||
# NOTE(pabelanger): Until we hit the validate-host role, we have a minimal
|
||||
# set of ansible variables collected by zuul-executor. This doesn't include
|
||||
# network variables (ansible_default_ipv4 / ansible_default_ipv6) so gather
|
||||
# these variables as they are important to the configure-unbound role.
|
||||
- name: Gather network facts
|
||||
setup:
|
||||
gather_subset: 'network'
|
||||
|
||||
roles:
|
||||
- add-build-sshkey
|
||||
- start-zuul-console
|
||||
- ensure-output-dirs
|
||||
- log-inventory
|
||||
|
||||
- hosts: all
|
||||
roles:
|
||||
# NOTE(pabelanger): We run this role in its own play to ensure unbound is
|
||||
# restarted before proceeding with any other role. This is because we use
|
||||
# notify / handler to restart the unbound service. With ansible notify
|
||||
# actions are triggered at the end of each block of tasks in a play.
|
||||
- configure-unbound
|
||||
|
||||
- hosts: all
|
||||
roles:
|
||||
- validate-host
|
||||
- use-cached-repos
|
||||
- mirror-workspace-git-repos
|
||||
- mirror-info
|
||||
- role: configure-mirrors
|
||||
set_apt_mirrors_trusted: True
|
||||
- role: fetch-zuul-cloner
|
||||
destination: "/usr/zuul-env/bin/zuul-cloner"
|
||||
repo_src_dir: "/home/zuul/src/git.openstack.org"
|
||||
109
zuul.d/jobs.yaml
109
zuul.d/jobs.yaml
|
|
@ -3,72 +3,6 @@
|
|||
# Overrides jobs from:
|
||||
# https://git.openstack.org/cgit/openstack-infra/zuul-jobs
|
||||
|
||||
|
||||
# Changes to this job require a special procedure, because they can
|
||||
# not be tested before landing, and if they are faulty, they will
|
||||
# break all jobs, meaning subsequent corrections will not be able to
|
||||
# land. To make a change:
|
||||
#
|
||||
# 1) Ensure that base-test and its playbooks are identical to base.
|
||||
# 2) Make the change to base-test and/or its playbooks.
|
||||
# 3) Merge the change from step 2. No jobs normally use base-test, so
|
||||
# this is safe.
|
||||
# 4) Propose a change to a job to reparent it to base-test. Choose a
|
||||
# job which will exercise whatever you are changing. The
|
||||
# "unittests" job in zuul-jobs is a good choice. Use [DNM] in the
|
||||
# commit subject so that people know not to merge the change. Set
|
||||
# it to "Work in progress" so people don't review it.
|
||||
# 5) Once test results arrive for the change in step 2, make a change
|
||||
# which copies the job and/or playbooks of base-test to base. In
|
||||
# the commit message, link to (without using Depends-On:) the
|
||||
# change from step 4 so reviewers can see the test results.
|
||||
# 6) Once the change in step 5 merges, abandon the change from step 4.
|
||||
- job:
|
||||
name: base
|
||||
parent: null
|
||||
abstract: true
|
||||
description: |
|
||||
The base job for OpenStack's installation of Zuul.
|
||||
|
||||
All jobs ultimately inherit from this. It runs a pre-playbook
|
||||
which copies all of the job's prepared git repos on to all of
|
||||
the nodes in the nodeset. It runs a post-playbook which copies
|
||||
all of the files in the logs/ subdirectory of the executor
|
||||
work directory to the logserver.
|
||||
|
||||
It also sets default timeout and nodeset values (which may be
|
||||
overidden).
|
||||
|
||||
Responds to these variables:
|
||||
|
||||
.. zuul:jobvar:: base_serial
|
||||
:default: Omitted
|
||||
|
||||
This sets the serial keyword in the pre and post playbooks
|
||||
which can be an integer or percentage.
|
||||
|
||||
See ansible documentation for more information:
|
||||
http://docs.ansible.com/ansible/latest/playbooks_delegation.html
|
||||
|
||||
pre-run: playbooks/base/pre.yaml
|
||||
post-run:
|
||||
- playbooks/base/post.yaml
|
||||
- playbooks/base/post-logs.yaml
|
||||
roles:
|
||||
- zuul: openstack-infra/zuul-jobs
|
||||
- zuul: openstack-infra/openstack-zuul-jobs
|
||||
vars:
|
||||
ara_report_type: database
|
||||
ara_report_path: ara-report
|
||||
timeout: 1800
|
||||
post-timeout: 1800
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
secrets:
|
||||
- site_logs
|
||||
|
||||
- job:
|
||||
name: base-minimal
|
||||
parent: null
|
||||
|
|
@ -99,36 +33,7 @@
|
|||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
secrets:
|
||||
- site_logs
|
||||
|
||||
# See the procedure described above "base" before making changes to
|
||||
# this job.
|
||||
- job:
|
||||
name: base-test
|
||||
parent: null
|
||||
description: |
|
||||
A job to test changes to the base job without disturbing the
|
||||
main job in production. Not for general use.
|
||||
pre-run: playbooks/base-test/pre.yaml
|
||||
post-run:
|
||||
- playbooks/base-test/post.yaml
|
||||
- playbooks/base-test/post-logs.yaml
|
||||
roles:
|
||||
- zuul: openstack-infra/zuul-jobs
|
||||
- zuul: openstack-infra/openstack-zuul-jobs
|
||||
timeout: 1800
|
||||
post-timeout: 1800
|
||||
vars:
|
||||
ara_report_type: database
|
||||
ara_report_path: ara-report
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
secrets:
|
||||
- site_logs
|
||||
- secret: site_tarballs
|
||||
name: fileserver
|
||||
- site_logs_project_config
|
||||
|
||||
# NOTE(corvus): A short-term test job
|
||||
- job:
|
||||
|
|
@ -136,9 +41,9 @@
|
|||
parent: null
|
||||
description: |
|
||||
A job to test storing logs in swift. Not for general use.
|
||||
pre-run: playbooks/base/pre.yaml
|
||||
pre-run: playbooks/base-test/pre.yaml
|
||||
post-run:
|
||||
- playbooks/base/post-ssh.yaml
|
||||
- playbooks/base-test/post-ssh.yaml
|
||||
- playbooks/base-test/post-logs-swift.yaml
|
||||
roles:
|
||||
- zuul: openstack-infra/zuul-jobs
|
||||
|
|
@ -189,7 +94,7 @@
|
|||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
secrets:
|
||||
- site_logs
|
||||
- site_logs_project_config
|
||||
|
||||
- job:
|
||||
name: publish-openstack-artifacts
|
||||
|
|
@ -499,7 +404,7 @@
|
|||
vars:
|
||||
tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
||||
secrets:
|
||||
- site_logs
|
||||
- site_specs
|
||||
|
||||
- job:
|
||||
name: publish-openstack-specs-site
|
||||
|
|
@ -517,7 +422,7 @@
|
|||
vars:
|
||||
tox_envlist: specs
|
||||
secrets:
|
||||
- site_logs
|
||||
- site_specs
|
||||
|
||||
- job:
|
||||
name: publish-tox-docs-infra
|
||||
|
|
@ -579,7 +484,7 @@
|
|||
vars:
|
||||
tox_envlist: publish
|
||||
secrets:
|
||||
- site_logs
|
||||
- site_specs
|
||||
|
||||
- job:
|
||||
name: publish-infra-index
|
||||
|
|
|
|||
|
|
@ -73,8 +73,59 @@
|
|||
R29caxEVG+gYN+nHeiMKhzKArFxSzbMzeI//uCNly2BPrTE9mmAVBfkiv2VcRY+5njEfP
|
||||
PJKmVEPlieG4owDMefEOOA4k13OqOQSpX976g3AGloyS5V0wNtFCYDuquO87SY=
|
||||
|
||||
# Remove this once all base jobs have been removed
|
||||
- secret:
|
||||
name: site_logs
|
||||
name: site_logs_project_config
|
||||
data:
|
||||
fqdn: logs.openstack.org
|
||||
path: /srv/static/logs
|
||||
ssh_known_hosts: |
|
||||
logs.openstack.org,23.253.108.137,2001:4800:7817:104:be76:4eff:fe05:dbee ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDcvLuGLagUAZfc0BThLus8ufSPCrIhDtG0BdXvhblJjvIbkuELD3dRWRZVSYZAdzGZRY3t6vTAcguTrkbQg5ngXfdfF+OKPkaH8DiZwAX/1g/iRXhInkZTGBVqHo9pLAMeNNwviSy2JjpTqdD6fLEkHwW+uw4E2YZhYivctTSbOepMkzAtFV0w5cpyBzjAT/Hax2x5un6es8R0Iw3AAnUmtapn5e5NCrg2rPNpd0nve84wUavvbC2DeGDOZQdnIahwo60Sder5ZE/x6cG39bkSDdgFQArAzrNrH6BHmNGjfFPpnGmfc7P8gQwDPtMf02HvKapqATXpIxdbSGimWLL
|
||||
ssh_username: jenkins
|
||||
ssh_private_key: !encrypted/pkcs1-oaep
|
||||
- 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
- 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
- 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
- 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
|
||||
|
||||
- secret:
|
||||
name: site_specs
|
||||
data:
|
||||
fqdn: logs.openstack.org
|
||||
path: /srv/static/logs
|
||||
|
|
|
|||
Loading…
Reference in New Issue