diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-12-15 14:36:39 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-12-15 14:49:02 +0100 |
| commit | 3b3e2f0b640512705b3824ea5d82035a0372341c (patch) | |
| tree | db91cc8ae8c6e1284f14a0b87f72418b7c258bea /jjb/releng/releng-release-jobs.yaml | |
| parent | d8cf647af9bc249587e86680bbef26192e5adaaa (diff) | |
Fix Releng Release jobs
Change-Id: Ieac2a4848e19b70a424061cd7cb51cf84808a413
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/releng/releng-release-jobs.yaml')
| -rw-r--r-- | jjb/releng/releng-release-jobs.yaml | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index c01e41e57..60dfb2a77 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -9,9 +9,6 @@ --- - project: name: releng-release-jobs - - build-node: 'opnfv-build' - stream: - fraser - gambia @@ -31,23 +28,22 @@ - wallaby - yoga - zed - jobs: - 'releng-release-{stream}-verify' - 'releng-release-{stream}-merge' - project: 'releng' - job-template: name: 'releng-release-{stream}-verify' - parameters: - - '{build-node}-defaults' - stream-parameter: stream: '{stream}' - project-parameter: project: '{project}' branch: 'master' + - label: + name: node + default: opnfv-build scm: - git-scm-gerrit @@ -79,8 +75,14 @@ pattern: 'releases/scripts/verify_schema.py' builders: + - shell: | + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 dist-upgrade -y + sudo DEBIAN_FRONTEND=noninteractive \ + apt-get -o DPkg::Lock::Timeout=300 install python3-pygerrit2 \ + python3-ruamel.yaml -y - shell: !include-raw-escape: - - releng-release-create-venv.sh - branch-or-tag.sh publishers: @@ -90,13 +92,9 @@ name: 'releng-release-{stream}-merge' parameters: - - node: - name: SLAVE_NAME - description: 'Only run merge job on build5 or 6' - default-slaves: - - lf-build6 - allowed-multiselect: false - ignore-offline-nodes: true + - label: + name: node + default: opnfv-build - stream-parameter: stream: '{stream}' - project-parameter: @@ -119,8 +117,14 @@ files: 'releases/{stream}/*' builders: + - shell: | + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 dist-upgrade -y + sudo DEBIAN_FRONTEND=noninteractive \ + apt-get -o DPkg::Lock::Timeout=300 install python3-pygerrit2 \ + python3-ruamel.yaml -y - shell: !include-raw-escape: - - releng-release-create-venv.sh - branch-or-tag.sh publishers: |