Update promote/publish secrets and jobs

This updates the promote and publish secrets and jobs to no longer
rely on jinja templates in secrets since Zuul removed support for
that.

Instead, we pass in only known safe static variables (ie, the "zuul"
hierarchy).

Change-Id: I4ea24dadf24437222373853cf70908d82e3dbbc3
This commit is contained in:
Jeremy Stanley 2021-06-24 16:11:40 +00:00
parent 813542fabd
commit 2e1623783a
2 changed files with 56 additions and 23 deletions

View File

@ -182,7 +182,7 @@
that need a special location.
Publish the results of the tox-docs job to
/afs/.openstack.org/docs/{{ special_publish_directory }}.
/afs/.openstack.org/docs/{special_publish_directory}.
This is a promote job for ``openstack-tox-docs``.
@ -297,12 +297,12 @@
Publish OpenStack specs project.
Publish specs index to
/afs/.openstack.org/project/specs.openstack.org/{{ zuul.project.name }}.
/afs/.openstack.org/project/specs.openstack.org/{zuul[project][name]}.
This is a promote job for ``openstack-tox-docs``.
vars:
download_artifact_job: openstack-tox-docs
publish_site: "specs.openstack.org/{{ zuul.project.name }}"
publish_site: "specs.openstack.org/{zuul[project][name]}"
- job:
name: promote-tox-docs-infra
@ -473,7 +473,7 @@
that need a special location.
Publish the results of the tox-docs job to
/afs/.openstack.org/project/{{publish_site }}.
/afs/.openstack.org/project/{publish_site}.
This is a promote job for ``openstack-tox-docs``.
@ -523,7 +523,7 @@
- airship/spyglass-plugin-xls
- airship/treasuremap
vars:
publish_site: "airshipit.org/docs/{{ zuul.project.short_name }}"
publish_site: "airshipit.org/docs/{zuul[project][short_name]}"
- job:
name: promote-governance-election

View File

@ -55,9 +55,16 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/{{ zuul.project.short_name }}/latest"
docs_branch_path: "/afs/.openstack.org/docs/{{ zuul.project.short_name }}/{{ zuul.branch | default('_error') | regex_replace('^stable/', '') }}"
docs_tag_path: "/afs/.openstack.org/docs/{{ zuul.project.short_name }}/{{ zuul.tag | default('_error') }}"
targets:
master:
path: "/afs/.openstack.org/docs/{zuul[project][short_name]}/latest"
branch:
path: "/afs/.openstack.org/docs/{zuul[project][short_name]}/{zuul[branch]}"
regex:
pattern: 'stable/(.*)$'
sub: '\1'
tag:
path: "/afs/.openstack.org/docs/{zuul[project][short_name]}/{zuul[tag]}"
- secret:
name: afsdocs_secret-tox-docs-direct
@ -75,7 +82,9 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/{{ zuul.project.short_name }}"
targets:
master:
path: "/afs/.openstack.org/docs/{zuul[project][short_name]}"
- secret:
name: afsdocs_secret-tox-docs-infra
@ -93,7 +102,9 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/infra/{{ zuul.project.short_name }}"
targets:
master:
path: "/afs/.openstack.org/docs/infra/{zuul[project][short_name]}"
- secret:
@ -112,8 +123,14 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/project-deploy-guide/{{ zuul.project.short_name }}/latest"
docs_branch_path: "/afs/.openstack.org/docs/project-deploy-guide/{{ zuul.project.short_name }}/{{ zuul.branch | default('_error') | regex_replace('^stable/', '') }}"
target:
master:
path: "/afs/.openstack.org/docs/project-deploy-guide/{zuul[project][short_name]}/latest"
branch:
path: "/afs/.openstack.org/docs/project-deploy-guide/{zuul[project][short_name]}/{zuul[branch]}"
regex:
pattern: 'stable/(.*)$'
sub: '\1'
- secret:
name: afsdocs_secret-tox-docs-special
@ -131,7 +148,9 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/{{ special_publish_directory }}"
targets:
master:
path: "/afs/.openstack.org/docs/{special_publish_directory}"
- secret:
# Same secret as afsdocs_secret but different data
@ -150,7 +169,9 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/project/{{ publish_site }}"
targets:
master:
path: "/afs/.openstack.org/project/{publish_site}"
- secret:
# Same secret as afsdocs_secret but different data for publishing releasenotes
@ -169,10 +190,14 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/docs/releasenotes/{{ zuul.project.short_name }}/"
# We build on master, even for branches, and publish always to same location
# Set this so that changes to branches get published correctly.
docs_branch_path: "/afs/.openstack.org/docs/releasenotes/{{ zuul.project.short_name }}/"
targets:
master:
path: "/afs/.openstack.org/docs/releasenotes/{zuul[project][short_name]}/"
# We build on master, even for branches, and publish always to same
# location. Set this so that changes to branches get published
# correctly.
branch:
path: "/afs/.openstack.org/docs/releasenotes/{{ zuul[project][short_name]}/"
- secret:
# Same secret as afsdocs_secret but different data for publishing to
@ -211,7 +236,9 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/project/starlingx.io/www/api-ref/{{ zuul.project.short_name }}"
targets:
master:
path: "/afs/.openstack.org/project/starlingx.io/www/api-ref/{zuul[project][short_name]}"
- secret:
name: afsdocs_secret-stx-tox-docs
@ -230,8 +257,11 @@
OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/project/starlingx.io/www/{{ zuul.project.short_name }}"
docs_branch_path: "/afs/.openstack.org/project/starlingx.io/www/{{ zuul.project.short_name }}/{{ zuul.branch | default('_error') }}"
targets:
master:
path: "/afs/.openstack.org/project/starlingx.io/www/{zuul[project][short_name]}"
branch:
path: "/afs/.openstack.org/project/starlingx.io/www/{zuul[project][short_name]}/{zuul[branch]}"
- secret:
name: afsdocs_secret-stx-tox-docs-site
@ -251,8 +281,11 @@
path: /afs/.openstack.org/docs
# TODO(pabelanger): Update AFS credentials to say zuul-executor.
service_name: service/zuul-launcher@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/project/starlingx.io/www/"
docs_branch_path: "/afs/.openstack.org/project/starlingx.io/www/{{ zuul.branch | default('_error') }}"
targets:
master:
path: "/afs/.openstack.org/project/starlingx.io/www/"
branch:
path: "/afs/.openstack.org/project/starlingx.io/www/{zuul[branch]}"
- secret:
name: testpypi_secret