Skip sig links if the skipped-sig flag is set
In releases.o.o we display signature links for all deliverables, if the series is > Ocata or independent. Since some "independent" deliverables predate the signature generation tooling, that results in a number of "independent" deliverables displaying broken signature links, which makes us look bad. This adds a flag (skipped-sig) that can be set for independent deliverables that did not have any signature generated (pre-Ocata), and skips the signature link display if the flag is set. As a practical example, this fixes broken links for PBR<2. Tony signed up to automatically generate the others. Change-Id: I44a49e3f08010a85c64673d2292528139eabcc99
This commit is contained in:
@@ -8,46 +8,68 @@ releases:
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 6e472b4905411a39e993c81c382a27ca9c771ef5
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.3.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 61a3a1ecdf99c680e509742fdc6c441b499af130
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.4.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 1e4d8836840622434230055e054666e164e10d14
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.5.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 5c0bb9186fe2d65901744b00af24c8c50b3e1d29
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.6.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 1e05037c2ae02a4d52d0f50abf00d61021971508
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.7.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 8047f2feafeead5f4913f9ab1d7d2c6d0ccf79e0
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.8.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: daa905cad45ea89b557b6468af021270980b9c24
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.8.1
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 36a2bf130999f06562b5eb063e1c49ae2d6e35a7
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.9.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: d4e29cb5d23e2bd1cf1b8a6b166b034279c764d7
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.9.1
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: a27f51242b041f8afd79d4fa2d4d6eaf1dda9f0c
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 1.10.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
hash: 83b9e6f3a64debf5924a2a160cbe3eb60c515817
|
||||
flags:
|
||||
- skipped-sig
|
||||
- version: 2.0.0
|
||||
projects:
|
||||
- repo: openstack/pbr
|
||||
|
||||
@@ -326,7 +326,8 @@ class DeliverableDirectiveBase(rst.Directive):
|
||||
links.artifact_signature_link(r.version,
|
||||
'pgp', p,
|
||||
deliv)
|
||||
if (series and series[0] >= 'o') or deliv.is_independent
|
||||
if ((series and series[0] >= 'o')
|
||||
or (deliv.is_independent and not r.skipped_sig))
|
||||
else '',
|
||||
p.repo, p.hash)
|
||||
for r in reversed(deliv.releases)
|
||||
|
||||
@@ -445,6 +445,11 @@ Each ``release`` entry is a mapping with keys:
|
||||
This release was applied by the release team, and not the project
|
||||
team.
|
||||
|
||||
``skipped-sig``
|
||||
This independent release pre-dates the Ocata cycle and did not
|
||||
generate any signature. Signature link display should be skipped
|
||||
when the release website pages are generated.
|
||||
|
||||
Each entry in the ``projects`` list is a mapping with keys:
|
||||
|
||||
``repo``
|
||||
|
||||
@@ -292,6 +292,10 @@ class Release(object):
|
||||
def was_forced(self):
|
||||
return 'forced' in self._data.get('flags', set())
|
||||
|
||||
@property
|
||||
def skipped_sig(self):
|
||||
return 'skipped-sig' in self._data.get('flags', set())
|
||||
|
||||
@property
|
||||
def projects(self):
|
||||
return sorted(self._projects.values())
|
||||
|
||||
@@ -92,7 +92,7 @@ properties:
|
||||
type: "array"
|
||||
items:
|
||||
type: "string"
|
||||
enum: [ "forced" ]
|
||||
enum: [ "forced", "skipped-sig" ]
|
||||
required: ["version", "projects"]
|
||||
additionalProperties: False
|
||||
branches:
|
||||
|
||||
Reference in New Issue
Block a user