diff options
| -rw-r--r-- | docs/ci/tables/ci-build-servers.rst | 4 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 14 | ||||
| -rwxr-xr-x | jjb/kuberef/kuberef-run-linting.sh | 56 | ||||
| -rw-r--r-- | jjb/kuberef/kuberef-verify-jobs.yaml | 51 | ||||
| -rw-r--r-- | jjb/kuberef/kuberef-views.yaml | 6 | ||||
| -rw-r--r-- | jjb/kuberef/kuberef.yaml | 20 | ||||
| -rw-r--r-- | jjb/releng/opnfv-utils.yaml | 2 |
7 files changed, 113 insertions, 40 deletions
diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst index ad168653e..b752a7b0f 100644 --- a/docs/ci/tables/ci-build-servers.rst +++ b/docs/ci/tables/ci-build-servers.rst @@ -18,10 +18,6 @@ - aarch64 - Ubuntu 16.04 - `Armband ENEA Team`_ - * - `ericsson-build3 <https://build.opnfv.org/ci/computer/ericsson-build3>`_ - - x86_64 - - Ubuntu 16.04 - - `Dianfeng Du`_ * - `ericsson-build4 <https://build.opnfv.org/ci/computer/ericsson-build4>`_ - x86_64 - Ubuntu 16.04 diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index b597b30e0..bd8ae345b 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -593,20 +593,6 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'ericsson-build3-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-build3' - description: 'Slave label on Jenkins' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: name: 'ericsson-build4-defaults' parameters: - label: diff --git a/jjb/kuberef/kuberef-run-linting.sh b/jjb/kuberef/kuberef-run-linting.sh new file mode 100755 index 000000000..4f681ac53 --- /dev/null +++ b/jjb/kuberef/kuberef-run-linting.sh @@ -0,0 +1,56 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 Samsung Electronics +# 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 -o nounset +set -o pipefail +set -o xtrace + +# shellcheck disable=SC1091 +source /etc/os-release || source /usr/lib/os-release + +pkgs="" +if ! command -v shellcheck; then + case ${ID,,} in + *suse*|rhel|centos|fedora) + pkgs="ShellCheck" + ;; + ubuntu|debian) + pkgs="shellcheck" + ;; + esac +fi + +if ! command -v pip; then + pkgs+=" python-pip" +fi + +if [ -n "$pkgs" ]; then + case ${ID,,} in + *suse*) + sudo zypper install --gpg-auto-import-keys refresh + sudo -H -E zypper install -y --no-recommends "$pkgs" + ;; + ubuntu|debian) + sudo apt-get update + sudo -H -E apt-get -y --no-install-recommends install "$pkgs" + ;; + rhel|centos|fedora) + PKG_MANAGER=$(command -v dnf || command -v yum) + if ! sudo "$PKG_MANAGER" repolist | grep "epel/"; then + sudo -H -E "$PKG_MANAGER" -q -y install epel-release + fi + sudo "$PKG_MANAGER" updateinfo --assumeyes + sudo -H -E "${PKG_MANAGER}" -y install "$pkgs" + ;; + esac +fi + +tox -e lint +bash -c 'shopt -s globstar; shellcheck **/*.sh' diff --git a/jjb/kuberef/kuberef-verify-jobs.yaml b/jjb/kuberef/kuberef-verify-jobs.yaml new file mode 100644 index 000000000..dfe6d7276 --- /dev/null +++ b/jjb/kuberef/kuberef-verify-jobs.yaml @@ -0,0 +1,51 @@ +--- +- project: + name: kuberef-verify + project: kuberef + stream: + - master: + branch: '{stream}' + jobs: + - '{project}-verify-lint-{stream}' + +- job-template: + name: '{project}-verify-lint-{stream}' + scm: + - kuberef-project-scm + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: 'kuberef' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + builders: + - kubref-run-linting + +- scm: + name: kuberef-project-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/kuberef + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' + +- builder: + name: kubref-run-linting + builders: + - shell: + !include-raw: ./kuberef-run-linting.sh diff --git a/jjb/kuberef/kuberef-views.yaml b/jjb/kuberef/kuberef-views.yaml new file mode 100644 index 000000000..7b19c2df6 --- /dev/null +++ b/jjb/kuberef/kuberef-views.yaml @@ -0,0 +1,6 @@ +--- +- project: + name: kuberef-view + views: + - project-view + project-name: kuberef diff --git a/jjb/kuberef/kuberef.yaml b/jjb/kuberef/kuberef.yaml deleted file mode 100644 index 6e42922b5..000000000 --- a/jjb/kuberef/kuberef.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: kuberef-project-view - project-name: kuberef - views: - - project-view - -- project: - name: kuberef-info - project: kuberef - project-name: kuberef - jobs: - - gerrit-info-yaml-verify - -- project: - name: kuberef - project: kuberef - project-name: kuberef - jobs: - - '{project}-verify-basic' diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 2cdb31bb0..3dd5ce40a 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -27,7 +27,6 @@ - arm-build3 - arm-build4 - arm-build5 - - ericsson-build3 - ericsson-build4 - lf-build2 allowed-multiselect: true @@ -93,7 +92,6 @@ - lf-build1 - lf-build2 - lf-build3 - - ericsson-build3 - ericsson-build4 allowed-multiselect: true ignore-offline-nodes: true |