Merge "Switch project-config to promote jobs [4]: Add promote jobs"

This commit is contained in:
Zuul 2019-09-17 18:30:42 +00:00 committed by Gerrit Code Review
commit 281c7db28b
5 changed files with 122 additions and 69 deletions

View File

@ -1,10 +0,0 @@
- hosts: all
roles:
- fetch-tox-output
- role: write-root-marker
root_marker_dir: "src/{{ zuul.project.canonical_name }}/docs-site/output"
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_src: "src/{{ zuul.project.canonical_name }}/docs-site/output/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -1,22 +0,0 @@
- hosts: all
roles:
- fetch-tox-output
- role: fetch-sphinx-output
sphinx_output_src: "src/{{ zuul.project.canonical_name }}/specs/output/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool
- hosts: localhost
roles:
- role: add-fileserver
fileserver: "{{ site_specs }}"
- hosts: "{{ site_specs.fqdn }}"
gather_facts: False
tasks:
- name: Upload specs site to fileserver
synchronize:
src: "{{ zuul.executor.work_root }}/artifacts/"
dest: "/srv/static/specs/"
no_log: true
when: zuul_success | bool

View File

@ -479,22 +479,52 @@
- site_specs
- job:
name: publish-openstack-specs-site
name: promote-openstack-specs-base
parent: opendev-promote-docs-base
abstract: true
protected: true
description: |
Publish OpenStack specs site to static.openstack.org specs/
final: true
pre-run: playbooks/project-config/pre-tox.yaml
run: playbooks/project-config/run-tox.yaml
post-run: playbooks/publish/openstack-specs-site.yaml
allowed-projects:
- openstack/project-config
Base job to promote content to specs.openstack.org.
Jobs need to set the variable ``static_target`` for site to
publish to.
run: playbooks/static-docs/promote.yaml
vars:
download_artifact_job: build-openstack-specs-site
static_target: ""
roles:
- zuul: zuul/zuul-jobs
- zuul: openstack/openstack-zuul-jobs
vars:
tox_envlist: specs
secrets:
- site_specs
- name: fileserver
secret: site_specs_promote
- job:
name: promote-openstack-specs-site
parent: promote-openstack-specs-base
final: true
description: |
Publish OpenStack specs site to static.openstack.org specs/
This is a promote job for ``build-openstack-specs-site``.
allowed-projects:
- openstack/project-config
vars:
download_artifact_job: build-openstack-specs-site
static_target: ""
- job:
name: promote-openstack-specs
parent: promote-openstack-specs-base
final: true
description: |
Publish OpenStack specs project to static.openstack.org
specs/{{ zuul.project.name }}.
This is a promote job for ``openstack-tox-docs``.
vars:
download_artifact_job: openstack-tox-docs
static_target: "{{ zuul.project.name }}"
- job:
name: promote-tox-docs-infra
@ -565,26 +595,18 @@
- site_specs
- job:
name: publish-infra-index
name: promote-infra-index
parent: promote-tox-docs-special-base
description: |
Publish the infrastructure documentation index
final: true
pre-run: playbooks/project-config/pre-tox.yaml
run: playbooks/project-config/run-tox.yaml
post-run:
- playbooks/publish/infra-index.yaml
- playbooks/publish/openstack-afs.yaml
Promote infra index.html to
https://docs.openstack.org/infra/
allowed-projects:
- openstack/project-config
roles:
- zuul: zuul/zuul-jobs
- zuul: openstack/openstack-zuul-jobs
final: true
branches: master
vars:
tox_envlist: infra-docs
afs_subpath: "/infra"
secrets:
- secret: afsdocs_secret
name: afs
download_artifact_job: project-config-infra-docs-index
special_publish_directory: "infra"
- job:
name: publish-infra-publications-index

View File

@ -3755,12 +3755,22 @@
check:
queue: project-config
jobs:
- build-openstack-specs-site
- build-openstack-specs-site:
files: &specs-site
- bindep.txt
- specs/.*
- other-requirements.txt
- tox.ini
- openstack-zuul-jobs-linters
- project-config-dib
- project-config-gerrit
- project-config-grafyaml
- project-config-infra-docs-index
- project-config-infra-docs-index:
files: &infra-docs-index
- bindep.txt
- docs-site/.*
- other-requirements.txt
- tox.ini
- project-config-irc-access
- project-config-nodepool
- project-config-bindep-fallback-centos-7
@ -3770,24 +3780,26 @@
gate:
queue: project-config
jobs:
- build-openstack-specs-site
- build-openstack-specs-site:
files: *specs-site
- openstack-zuul-jobs-linters
- project-config-dib
- project-config-gerrit
- project-config-grafyaml
- project-config-infra-docs-index
- project-config-infra-docs-index:
files: *infra-docs-index
- project-config-irc-access
- project-config-nodepool
- project-config-bindep-fallback-centos-7
- project-config-bindep-fallback-opensuse-15
- project-config-bindep-fallback-ubuntu-trusty
- project-config-bindep-fallback-ubuntu-xenial
# Temporarily disabled to allow us to update them.
# TODO(jaegerandi): Enable in promote pipeline.
# post:
# jobs:
# - publish-infra-index
# - publish-openstack-specs-site
promote:
jobs:
- promote-infra-index:
files: *infra-docs-index
- promote-openstack-specs-site:
files: *specs-site
periodic:
jobs:
- propose-project-config-update

View File

@ -357,6 +357,57 @@
CDih/PpK9ofisCqVyvl0E+4l75l4P4TCdi7d96/9qTQSIP0b8uraGnw1QvGj46j4Cus1o
4tjgrxleCEIUTCykp5IWhjbfYUIMK1dqaaEoGE27qBC8FY5rrq9cEVtFvGCUOM=
- secret:
name: site_specs_promote
# This is the same as site_specs, just path is different
data:
fqdn: logs.openstack.org
path: /srv/static/specs
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_tarballs
data: