diff options
| -rwxr-xr-x | jjb/releng/branch-or-tag.sh | 1 | ||||
| -rw-r--r-- | jjb/releng/releng-release-create-venv.sh | 19 | ||||
| -rw-r--r-- | jjb/releng/releng-release-jobs.yaml | 36 | ||||
| -rw-r--r-- | releases/scripts/requirements.txt | 5 |
4 files changed, 20 insertions, 41 deletions
diff --git a/jjb/releng/branch-or-tag.sh b/jjb/releng/branch-or-tag.sh index 0fdb24fca..332cb35b1 100755 --- a/jjb/releng/branch-or-tag.sh +++ b/jjb/releng/branch-or-tag.sh @@ -29,7 +29,6 @@ for release_file in $RELEASE_FILES; do if [ -n "$branch_actual" ]; then echo "$repo refs/heads/$branch already exists at $branch_actual" - echo "RUN releng-release-create-venv.sh" source jjb/releng/releng-release-tagging.sh else echo "This is a branching job" diff --git a/jjb/releng/releng-release-create-venv.sh b/jjb/releng/releng-release-create-venv.sh deleted file mode 100644 index 63410b9e0..000000000 --- a/jjb/releng/releng-release-create-venv.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# 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 -############################################################################## -set -e -o pipefail -echo "---> Create virtualenv" - -sudo -H python3 -m pip install "virtualenv<=20.15.1" -python3 -m venv $WORKSPACE/venv - -# shellcheck source=$WORKSPACE/venv/bin/activate disable=SC1091 -source $WORKSPACE/venv/bin/activate -python3 -m pip install --upgrade pip -python3 -m pip install -r releases/scripts/requirements.txt 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: diff --git a/releases/scripts/requirements.txt b/releases/scripts/requirements.txt deleted file mode 100644 index 5a7d216e9..000000000 --- a/releases/scripts/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -pygerrit2 < 2.1.0 -PyYAML < 4.0 -jsonschema < 2.7.0 -rfc3987 -ruamel.yaml |