From 842c992ce8762e9f75ab285b3eac9c0fc9e91049 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 15 Dec 2022 15:25:13 +0100 Subject: [PATCH] Optimize Releng release jobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ic0ae2e1117b08d1b8414eb917eab34655170ef64 Signed-off-by: Cédric Ollivier --- jjb/releng/releng-jobs.yaml | 103 ++++++++++++++++++++++++++ jjb/releng/releng-release-jobs.yaml | 139 ------------------------------------ 2 files changed, 103 insertions(+), 139 deletions(-) delete mode 100644 jjb/releng/releng-release-jobs.yaml diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml index a3a6fd33e..8dba1d50a 100644 --- a/jjb/releng/releng-jobs.yaml +++ b/jjb/releng/releng-jobs.yaml @@ -178,3 +178,106 @@ name: releng-tox jobs: - releng-tox + +- project: + name: releng-release-jobs + stream: + - fraser + - gambia + - hunter + - iruya + - jerma + - kali + - leguer + - lakelse + - moselle + - v1.21 + - v1.22 + - v1.23 + - v1.24 + - v1.25 + - xena + - wallaby + - yoga + - zed + jobs: + - 'releng-release-{stream}-verify' + - 'releng-release-{stream}-merge' + +- job-template: + name: 'releng-release-{stream}-verify' + scm: + - releng-scm: + ref: $GERRIT_REFSPEC + parameters: + - releng-jjb-node: + node: opnfv-build + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: 'releng' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/master' + file-paths: + - compare-type: ANT + pattern: 'releases/{stream}/**' + - compare-type: ANT + pattern: 'releases/schema.yaml' + - compare-type: ANT + 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: + - branch-or-tag.sh + +- job-template: + name: 'releng-release-{stream}-merge' + triggers: + - releng-patchset-merged + scm: + - releng-scm: + ref: master + parameters: + - releng-jjb-node: + node: opnfv-build + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: 'releng' + branches: + - branch-compare-type: 'ANT' + branch-pattern: 'master' + 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: + - branch-or-tag.sh diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml deleted file mode 100644 index 60dfb2a77..000000000 --- a/jjb/releng/releng-release-jobs.yaml +++ /dev/null @@ -1,139 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- project: - name: releng-release-jobs - stream: - - fraser - - gambia - - hunter - - iruya - - jerma - - kali - - leguer - - lakelse - - moselle - - v1.21 - - v1.22 - - v1.23 - - v1.24 - - v1.25 - - xena - - wallaby - - yoga - - zed - jobs: - - 'releng-release-{stream}-verify' - - 'releng-release-{stream}-merge' - project: 'releng' - -- job-template: - name: 'releng-release-{stream}-verify' - parameters: - - stream-parameter: - stream: '{stream}' - - project-parameter: - project: '{project}' - branch: 'master' - - label: - name: node - default: opnfv-build - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: 'releases/{stream}/**' - - compare-type: ANT - pattern: 'releases/schema.yaml' - - compare-type: ANT - 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: - - branch-or-tag.sh - - publishers: - - email-jenkins-admins-on-failure - -- job-template: - name: 'releng-release-{stream}-merge' - - parameters: - - label: - name: node - default: opnfv-build - - stream-parameter: - stream: '{stream}' - - project-parameter: - project: '{project}' - branch: 'master' - # Override GIT_URL so we can send patches back to Gerrit and - # modify repos - - string: - name: GIT_URL - default: ssh://$USER@gerrit.opnfv.org:29418/ - description: 'Git URL to use on this Jenkins Slave' - - scm: - - git-scm-gerrit - - triggers: - - gerrit-trigger-change-merged: - project: '{project}' - branch: 'master' - 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: - - branch-or-tag.sh - - publishers: - - email-jenkins-admins-on-failure - -- parameter: - name: stream-parameter - parameters: - - string: - name: STREAM - default: '{stream}' - description: "OPNFV Stable Stream" -- 2.16.6