diff options
| -rw-r--r-- | jjb/barometer/barometer.yaml | 32 | ||||
| -rw-r--r-- | jjb/functest/xtesting-ci-docker.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/xtesting-pi.yaml | 30 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 10 | ||||
| -rw-r--r-- | jjb/global/basic-jobs.yaml | 46 | ||||
| -rw-r--r-- | jjb/global/installer-params.yaml | 140 | ||||
| -rwxr-xr-x | jjb/global/installer-report.sh | 46 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yaml | 38 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 1239 | ||||
| -rw-r--r-- | jjb/laas/laas.yml | 18 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker-arm.yaml | 215 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 156 | ||||
| -rw-r--r-- | jjb/releng/releng-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/releng/releng-release-create-branch.sh | 2 | ||||
| -rw-r--r-- | jjb/vineperf/vineperf.yaml | 8 | ||||
| -rw-r--r-- | releases/nile/barometer.yaml | 17 | ||||
| -rw-r--r-- | releases/nile/vineperf.yaml | 17 |
17 files changed, 171 insertions, 1853 deletions
diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index b56a9ffe0..7b25e8efb 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -3,6 +3,24 @@ # All the jobs except verify have been removed! # They will only be enabled on request by projects! ################################################### + +- parameter: + name: 'opnfv-build-centos-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-centos' + 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' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - project: name: barometer @@ -19,23 +37,27 @@ branch: '{stream}' gs-pathname: '' disabled: false - - moselle: &moselle + - nile: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - moselle: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - lakelse: &lakelse + - lakelse: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - kali: &kali + - kali: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - jerma: &jerma + - jerma: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - iruya: &iruya + - iruya: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/xtesting-ci-docker.yaml b/jjb/functest/xtesting-ci-docker.yaml index 0025e2786..422d7b8ed 100644 --- a/jjb/functest/xtesting-ci-docker.yaml +++ b/jjb/functest/xtesting-ci-docker.yaml @@ -55,7 +55,7 @@ parameters: - label: name: node - default: 'opnfv-build' + default: 'lf-virtual1' - job-template: name: xtesting-ci-docker-{stream} @@ -146,7 +146,7 @@ parameters: - label: name: node - default: 'opnfv-build' + default: 'lf-virtual1' - job-template: name: 'xtesting-ci-docker-trivy-{stream}' diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index 5e5438be6..223321274 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -12,35 +12,35 @@ port: tag: - latest: - node: opnfv-build + node: lf-virtual1 - zed: - node: opnfv-build + node: lf-virtual1 - yoga: - node: opnfv-build + node: lf-virtual1 - xena: - node: opnfv-build + node: lf-virtual1 - wallaby: - node: opnfv-build + node: lf-virtual1 - arm-latest: - node: opnfv-build + node: lf-virtual1 - arm-zed: - node: opnfv-build + node: lf-virtual1 - arm-yoga: - node: opnfv-build + node: lf-virtual1 - arm-xena: - node: opnfv-build + node: lf-virtual1 - arm-wallaby: - node: opnfv-build + node: lf-virtual1 - arm64-latest: - node: opnfv-build + node: lf-virtual1 - arm64-zed: - node: opnfv-build + node: lf-virtual1 - arm64-yoga: - node: opnfv-build + node: lf-virtual1 - arm64-xena: - node: opnfv-build + node: lf-virtual1 - arm64-wallaby: - node: opnfv-build + node: lf-virtual1 - xtesting-pi-jobs: &xtesting-pi-jobs name: 'xtesting-pi-jobs' diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 9f38a867a..a9f1d75c8 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -15,31 +15,31 @@ from: build_args: branch: master - node: opnfv-build + node: lf-virtual1 dependency: 3.16 - zed: from: build_args: branch: stable/zed - node: opnfv-build + node: lf-virtual1 dependency: 3.16 - yoga: from: build_args: branch: stable/yoga - node: opnfv-build + node: lf-virtual1 dependency: 3.16 - xena: from: build_args: branch: stable/xena - node: opnfv-build + node: lf-virtual1 dependency: 3.14 - wallaby: from: build_args: branch: stable/wallaby - node: opnfv-build + node: lf-virtual1 dependency: 3.13 - xtesting-jobs: &xtesting-jobs diff --git a/jjb/global/basic-jobs.yaml b/jjb/global/basic-jobs.yaml deleted file mode 100644 index d2c271105..000000000 --- a/jjb/global/basic-jobs.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -## -# Basic Job Config -# -# This is used for project which don't have any jobs of substance -# defined yet, but still need 'Verified+1'. -## -- job-group: - name: '{project}-verify-basic' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - jobs: - - '{project}-verify-{stream}' - -- job-template: - name: '{project}-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-defaults' - - scm: - - git-scm-gerrit - - triggers: - - gerrit-trigger-patchset-created: - project: '{project}' - branch: '{branch}' - files: 'docs/**|.gitignore' - - builders: - - shell: | - echo "Nothing to verify!" diff --git a/jjb/global/installer-params.yaml b/jjb/global/installer-params.yaml deleted file mode 100644 index 163d9152b..000000000 --- a/jjb/global/installer-params.yaml +++ /dev/null @@ -1,140 +0,0 @@ ---- -- parameter: - name: 'apex-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '192.168.X.X' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: apex - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'external' - description: 'external network for test' - -- parameter: - name: 'fuel-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' - - string: - name: SSH_KEY - default: "/var/lib/opnfv/mcp.rsa" - description: 'Path to private SSH key to access environment nodes' - - string: - name: INSTALLER_TYPE - default: fuel - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'floating_net' - description: 'external network for test' - - string: - name: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "URL to Google Storage." - - string: - name: CI_DEBUG - default: 'false' - description: "Show debug output information" - -- parameter: - name: 'joid-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '192.168.122.5' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: joid - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: MODEL - default: 'os' - description: 'Model to deploy (os|k8)' - - string: - name: OS_RELEASE - default: 'pike' - description: 'OpenStack release (mitaka|ocata|pike)' - - string: - name: EXTERNAL_NETWORK - default: ext-net - description: "External network used for Floating ips." - - string: - name: LAB_CONFIG - default: "$HOME/joid_config" - description: "Local lab config and Openstack openrc location" - - string: - name: MAAS_REINSTALL - default: 'false' - description: "Reinstall MAAS and Bootstrap before deploy [true/false]" - - string: - name: UBUNTU_DISTRO - default: 'xenial' - description: "Ubuntu distribution to use for Openstack (xenial)" - - string: - name: CPU_ARCHITECTURE - default: 'amd64' - description: "CPU Architecture to use for Ubuntu distro " - -- parameter: - name: 'daisy-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '10.20.7.3' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: daisy - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: BRIDGE - default: 'br7' - description: 'pxe bridge for booting of Daisy master' - - string: - name: EXTERNAL_NETWORK - default: 'admin_external' - description: 'external network for test' - -- parameter: - name: 'infra-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '192.168.122.2' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: infra - description: 'Installer used for deploying OPNFV on this POD' - -- parameter: - name: 'netvirt-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '192.168.X.X' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: apex - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'external' - description: 'external network for test' - -- parameter: - name: 'deploy-scenario' - parameters: - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - description: "OPNFV deployment scenario" diff --git a/jjb/global/installer-report.sh b/jjb/global/installer-report.sh deleted file mode 100755 index 6cd83f1f1..000000000 --- a/jjb/global/installer-report.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2017 ZTE Corporation 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 -############################################################################## - -source $WORKSPACE/installer_track.sh - -gen_content() -{ - cat <<EOF -{ - "installer": "$INSTALLER", - "version": "$INSTALLER_VERSION", - "pod_name": "$NODE_NAME", - "job_name": "$JOB_NAME", - "build_id": "$BUILD_ID", - "scenario": "$DEPLOY_SCENARIO", - "upstream_job_name": "$UPSTREAM_JOB_NAME", - "upstream_build_id":"$UPSTREAM_BUILD_ID", - "criteria": "$PROVISION_RESULT", - "start_date": "$TIMESTAMP_START", - "stop_date": "$TIMESTAMP_END", - "details":"" -} -EOF -} - -echo "Installer: $INSTALLER provision result: $PROVISION_RESULT" -echo $(gen_content) - -set -o xtrace -curl -H "Content-Type: application/json" -X POST -v -d "$(gen_content)" \ - $TESTAPI_URL/deployresults || true - -# INFO -# postbuildscript plugin shall always return the original job running status, -# for the result returned from postbuildscript affects the CI pipeline. -if [ "$PROVISION_RESULT" == "PASS" ]; then - exit 0 -else - exit 1 -fi diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml index 031e24070..8a8bbaf16 100644 --- a/jjb/global/releng-macros.yaml +++ b/jjb/global/releng-macros.yaml @@ -358,7 +358,8 @@ echo cat gerrit_comment.txt echo - ssh -p 29418 gerrit.opnfv.org \ + ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' \ + -p 29418 jenkins-ci@gerrit.opnfv.org \ "gerrit review -p $GERRIT_PROJECT \ -m '$(cat gerrit_comment.txt)' \ $GERRIT_PATCHSET_REVISION \ @@ -419,7 +420,7 @@ msg="Found syntax error and/or coding style violation(s) in the files modified by your patchset." sed -i -e "1s#^#${msg}\n\n#" violation.log cmd="gerrit review -p $GERRIT_PROJECT -m \"$(cat violation.log)\" $GERRIT_PATCHSET_REVISION --notify NONE" - ssh -p 29418 gerrit.opnfv.org "$cmd" + ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -p 29418 jenkins-ci@gerrit.opnfv.org "$cmd" # Make sure the caller job failed exit 1 @@ -557,36 +558,3 @@ failure: true send-to: - recipients - -- publisher: - name: 'report-provision-result' - publishers: - - postbuildscript: - builders: - - role: BOTH - build-on: - - SUCCESS - build-steps: - - shell: | - echo "export PROVISION_RESULT=PASS" >> $WORKSPACE/installer_track.sh - echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh - echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh - - shell: - !include-raw: installer-report.sh - mark-unstable-if-failed: true - - postbuildscript: - builders: - - role: BOTH - build-on: - - ABORTED - - FAILURE - - NOT_BUILT - - UNSTABLE - build-steps: - - shell: | - echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh - echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh - echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' >> $WORKSPACE/installer_track.sh - - shell: - !include-raw: installer-report.sh - mark-unstable-if-failed: true diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index d23171832..50743b70b 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -1,561 +1,3 @@ ---- -##################################################### -# Parameters for slaves using old labels -# This will be cleaned up once the new job structure and -# use of the new labels are in place -##################################################### -- parameter: - name: 'apex-baremetal-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-baremetal-hunter-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-baremetal-gambia-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-baremetal-fraser-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-baremetal-euphrates-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-baremetal-danube-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal-danube' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - - -- parameter: - name: 'apex-virtual-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-virtual-hunter-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-virtual-gambia-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-virtual-fraser-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-virtual-euphrates-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-master' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'apex-virtual-danube-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual-danube' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'lf-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'lf-pod3-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod3 - default-slaves: - - lf-pod3 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'lf-pod4-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod4 - default-slaves: - - lf-pod4 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'lf-pod5-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod5 - default-slaves: - - lf-pod5 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -##################################################### -# Parameters for CI baremetal PODs -##################################################### -- parameter: - name: 'apex-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-baremetal' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'fuel-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'fuel-baremetal' - 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: 'armband-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'armband-baremetal' - 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: 'auto-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'auto-baremetal' - 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: 'joid-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'joid-baremetal' - 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' - - string: - name: EXTERNAL_NETWORK - default: ext-net - description: "External network floating ips" - -- parameter: - name: 'daisy-baremetal-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-pod2 - default-slaves: - - zte-pod2 - - label: - name: SLAVE_LABEL - default: 'daisy-baremetal' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: INSTALLER_IP - default: '10.20.7.3' - description: 'IP of the installer' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -##################################################### -# Parameters for CI virtual PODs -##################################################### -- parameter: - name: 'apex-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'apex-virtual' - 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' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'fuel-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'fuel-virtual' - 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: 'armband-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'armband-virtual' - 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: 'joid-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'joid-virtual' - 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: 'daisy-virtual-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-virtual1 - - zte-virtual2 - default-slaves: - - zte-virtual1 - - label: - name: SLAVE_LABEL - default: 'daisy-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: INSTALLER_IP - default: '10.20.11.2' - description: 'IP of the installer' - - string: - name: BRIDGE - default: 'daisy1' - description: 'pxe bridge for booting of Daisy master' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'functest-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'functest-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - -##################################################### -# Parameters for build slaves -##################################################### -- parameter: - name: 'opnfv-build-centos-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build-centos' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'opnfv-build-ubuntu-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build-ubuntu' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'lf-virtual1-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'lf-virtual1' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'laas-dashboard-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'laas-dashboard' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - parameter: name: 'opnfv-build-defaults' parameters: @@ -575,26 +17,11 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'huawei-build-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-build - default-slaves: - - huawei-build - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'opnfv-build-ubuntu-arm-defaults' + name: 'opnfv-build-ubuntu-defaults' parameters: - label: name: SLAVE_LABEL - default: 'opnfv-build-ubuntu-arm' + default: 'opnfv-build-ubuntu' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -607,88 +34,6 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." -##################################################### -# Parameters for none-CI PODs -##################################################### -- parameter: - name: 'cengn-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - cengn-pod1 - default-slaves: - - cengn-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod1 - default-slaves: - - intel-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-pod2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod2 - default-slaves: - - intel-pod2 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'intel-pod9-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod9 - default-slaves: - - intel-pod9 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-pod10-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod10 - default-slaves: - - intel-pod10 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'intel-pod12-defaults' parameters: @@ -703,583 +48,3 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-pod18-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod18 - default-slaves: - - intel-pod18 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'itri-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - itri-pod1 - default-slaves: - - itri-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' - -- parameter: - name: 'huawei-pod3-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-pod3 - default-slaves: - - huawei-pod3 - - label: - name: SLAVE_LABEL - default: 'huawei-test' - 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: 'huawei-pod4-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-pod4 - default-slaves: - - huawei-pod4 - - label: - name: SLAVE_LABEL - default: 'huawei-test' - 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: 'intel-pod8-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod8 - default-slaves: - - intel-pod8 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - - -- parameter: - name: 'intel-pod15-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod15 - default-slaves: - - intel-pod15 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - -- parameter: - name: 'intel-pod17-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod17 - default-slaves: - - intel-pod17 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - -- parameter: - name: 'huawei-virtual5-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'huawei-virtual5' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - -- parameter: - name: 'huawei-virtual7-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-virtual7 - default-slaves: - - huawei-virtual7 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - -- parameter: - name: 'huawei-pod7-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-pod7 - default-slaves: - - huawei-pod7 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - -- parameter: - name: 'zte-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-pod1 - default-slaves: - - zte-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: INSTALLER_IP - default: '10.20.6.2' - description: 'IP of the installer' - - string: - name: BRIDGE - default: 'br6' - description: 'pxe bridge for booting of Fuel master' - -- parameter: - name: 'zte-pod2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-pod2 - default-slaves: - - zte-pod2 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: INSTALLER_IP - default: '10.20.7.3' - description: 'IP of the installer' - - string: - name: BRIDGE - default: 'br7' - description: 'pxe bridge for booting of Daisy master' - -- parameter: - name: 'zte-pod3-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-pod3 - default-slaves: - - zte-pod3 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' - - string: - name: BRIDGE - default: 'br0' - description: 'pxe bridge for booting of Daisy master' - -- parameter: - name: 'zte-pod9-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-pod9 - default-slaves: - - zte-pod9 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: INSTALLER_IP - default: '10.20.7.2' - description: 'IP of the installer' - - string: - name: BRIDGE - default: 'br0' - description: 'pxe bridge for booting of Daisy master' - -- parameter: - name: zte-virtual5-defaults - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-virtual5 - default-slaves: - - zte-virtual5 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: zte-virtual6-defaults - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - zte-virtual6 - default-slaves: - - zte-virtual6 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'juniper-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - juniper-pod1 - default-slaves: - - juniper-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /srv - description: "Disks to use by ceph (comma separated list)" - -- parameter: - name: 'orange-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - orange-pod1 - default-slaves: - - orange-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'orange-pod2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - orange-pod2 - default-slaves: - - orange-pod2 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'orange-pod5-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - orange-pod5 - default-slaves: - - orange-pod5 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'dell-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - dell-pod1 - default-slaves: - - dell-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'dell-pod2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - dell-pod2 - default-slaves: - - dell-pod2 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'nokia-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - nokia-pod1 - default-slaves: - - nokia-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - -- parameter: - name: 'intel-virtual6-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-virtual6 - default-slaves: - - intel-virtual6 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-virtual10-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-virtual10 - default-slaves: - - intel-virtual10 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'doctor-slave-parameter' - parameters: - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'ericsson-virtual5-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-virtual5' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://git.opendaylight.org/gerrit/p/$PROJECT.git - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'ericsson-virtual12-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-virtual12' - 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-virtual13-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-virtual13' - 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-virtual-pod1bl01-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-virtual-pod1bl01' - 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: 'odl-netvirt-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'odl-netvirt-virtual' - 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: 'odl-netvirt-virtual-intel-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'odl-netvirt-virtual-intel' - 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: 'flex-pod1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - flex-pod1 - default-slaves: - - flex-pod1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -##################################################### -# These slaves are just dummy slaves for sandbox jobs -##################################################### -- parameter: - name: 'sandbox-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'sandbox-baremetal' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'sandbox-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'sandbox-virtual' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'dummy-pod1-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'dummy-pod1' - 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' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." diff --git a/jjb/laas/laas.yml b/jjb/laas/laas.yml index 14141de5f..197495475 100644 --- a/jjb/laas/laas.yml +++ b/jjb/laas/laas.yml @@ -1,4 +1,22 @@ --- +- parameter: + name: 'laas-dashboard-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'laas-dashboard' + 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' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - project: name: laas-dashboard-jobs diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml deleted file mode 100644 index 8a10a28b6..000000000 --- a/jjb/releng/opnfv-docker-arm.yaml +++ /dev/null @@ -1,215 +0,0 @@ ---- -############################################## -# job configuration for docker build and push -############################################## - -- project: - - name: opnfv-docker-arm - - master: &master - stream: master - branch: '{stream}' - disabled: false - euphrates: &euphrates - stream: euphrates - branch: 'stable/{stream}' - disabled: false - hunter: &hunter - stream: hunter - branch: 'stable/{stream}' - disabled: false - iruya: &iruya - stream: iruya - branch: 'stable/{stream}' - disabled: false - jerma: &jerma - stream: jerma - branch: 'stable/{stream}' - disabled: false - dovetail-arm-receivers: &dovetail-arm-receivers - receivers: > - cristina.pauna@enea.com - alexandru.avadanii@enea.com - storperf-arm-receivers: &storperf-arm-receivers - receivers: > - cristina.pauna@enea.com - alexandru.avadanii@enea.com - mbeierl@vmware.com - other-receivers: &other-receivers - receivers: '' - - dockerfile: "Dockerfile" - dockerdir: "docker" - docker_repo_name: "opnfv/{project}_aarch64" - arch_tag: "" - extra_build_args: "" - - # yamllint disable rule:key-duplicates - dockerrepo: - # projects with jobs for master - - 'dovetail': - project: 'dovetail' - <<: *master - <<: *dovetail-arm-receivers - - 'storperf-master': - project: 'storperf' - dockerdir: 'docker/storperf-master' - docker_repo_name: 'opnfv/storperf-master' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - 'storperf-graphite': - project: 'storperf' - dockerdir: 'docker/storperf-graphite' - docker_repo_name: 'opnfv/storperf-graphite' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - 'storperf-httpfrontend': - project: 'storperf' - dockerdir: 'docker/storperf-httpfrontend' - docker_repo_name: 'opnfv/storperf-httpfrontend' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - 'storperf-reporting': - project: 'storperf' - dockerdir: 'docker/storperf-reporting' - docker_repo_name: 'opnfv/storperf-reporting' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - 'storperf-swaggerui': - project: 'storperf' - dockerdir: 'docker/storperf-swaggerui' - docker_repo_name: 'opnfv/storperf-swaggerui' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - 'storperf-workloadagent': - project: 'storperf' - dockerdir: 'docker/storperf-workloadagent' - docker_repo_name: 'opnfv/storperf-workloadagent' - arch_tag: 'aarch64' - <<: *master - <<: *storperf-arm-receivers - - # projects with jobs for stable/euphrates - - 'dovetail': - project: 'dovetail' - <<: *euphrates - <<: *dovetail-arm-receivers - - # projects with jobs for stable/iruya - - 'storperf-master': - project: 'storperf' - dockerdir: 'docker/storperf-master' - docker_repo_name: 'opnfv/storperf-master' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - 'storperf-graphite': - project: 'storperf' - dockerdir: 'docker/storperf-graphite' - docker_repo_name: 'opnfv/storperf-graphite' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - 'storperf-httpfrontend': - project: 'storperf' - dockerdir: 'docker/storperf-httpfrontend' - docker_repo_name: 'opnfv/storperf-httpfrontend' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - 'storperf-reporting': - project: 'storperf' - dockerdir: 'docker/storperf-reporting' - docker_repo_name: 'opnfv/storperf-reporting' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - 'storperf-swaggerui': - project: 'storperf' - dockerdir: 'docker/storperf-swaggerui' - docker_repo_name: 'opnfv/storperf-swaggerui' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - 'storperf-workloadagent': - project: 'storperf' - dockerdir: 'docker/storperf-workloadagent' - docker_repo_name: 'opnfv/storperf-workloadagent' - arch_tag: 'aarch64' - <<: *iruya - <<: *storperf-arm-receivers - - # yamllint enable rule:key-duplicates - jobs: - - '{dockerrepo}-docker-build-arm-push-{stream}' - -######################## -# job templates -######################## -- job-template: - name: '{dockerrepo}-docker-build-arm-push-{stream}' - - disabled: '{obj:disabled}' - - parameters: ¶meters - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-arm-defaults' - - string: - name: PUSH_IMAGE - default: "true" - description: "To enable/disable pushing the image to Dockerhub." - - string: - name: DOCKER_REPO_NAME - default: "{docker_repo_name}" - description: "Dockerhub repo to be pushed to." - - string: - name: GERRIT_REFNAME - default: "" - description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1" - - string: - name: DOCKER_DIR - default: "{dockerdir}" - description: "Directory containing files needed by the Dockerfile" - - string: - name: DOCKERFILE - default: "{dockerfile}" - description: "Dockerfile to use for creating the image." - - string: - name: ARCH_TAG - default: "{arch_tag}" - description: "If set, this value will be added to the docker image tag" - - string: - name: EXTRA_BUILD_ARGS - default: "{extra_build_args}" - description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image" - - properties: - - throttle: - max-per-node: 1 - option: 'project' - - scm: - - git-scm - - builders: &builders - - shell: - !include-raw-escape: ./opnfv-docker.sh - - triggers: - - pollscm: - cron: "*/30 * * * *" - - gerrit-trigger-tag-created: - project: '{project}' - - publishers: - - email: - recipients: '{receivers}' - - email-jenkins-admins-on-failure diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 7adfee92c..cffc6784d 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -35,13 +35,14 @@ stream: moselle branch: 'stable/{stream}' disabled: false + nile: &nile + stream: nile + branch: 'stable/{stream}' + disabled: false laas-receivers: &laas_receivers receivers: > pberberian@iol.unh.edu sbergeron@iol.unh.edu - storperf-receivers: &storperf-receivers - receivers: > - mbeierl@vmware.com samplevnf-receivers: &samplevnf-receivers receivers: > luc.provoost@intel.com @@ -118,26 +119,6 @@ dockerdir: 'docker/barometer-snmp' <<: *master <<: *other-receivers - - 'dovetail': - project: 'dovetail' - <<: *master - <<: *other-receivers - - 'dovetail-webportal-api': - project: 'dovetail-webportal' - dockerfile: 'Dockerfile.api' - <<: *master - <<: *other-receivers - - 'dovetail-webportal-web': - project: 'dovetail-webportal' - dockerfile: 'Dockerfile.web' - <<: *master - <<: *other-receivers - - 'dovetail-webportal-web-onap': - project: 'dovetail-webportal' - dockerfile: 'Dockerfile.web' - extra_build_args: 'CONTAINER=onap GUI=onap-ui' - <<: *master - <<: *other-receivers - 'nfvbench': project: 'nfvbench' <<: *master @@ -154,42 +135,6 @@ dockerfile: 'worker/Dockerfile' <<: *master <<: *laas_receivers - - 'storperf-master': - project: 'storperf' - dockerdir: 'docker/storperf-master' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - - 'storperf-graphite': - project: 'storperf' - dockerdir: 'docker/storperf-graphite' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - - 'storperf-httpfrontend': - project: 'storperf' - dockerdir: 'docker/storperf-httpfrontend' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - - 'storperf-reporting': - project: 'storperf' - dockerdir: 'docker/storperf-reporting' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - - 'storperf-swaggerui': - project: 'storperf' - dockerdir: 'docker/storperf-swaggerui' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - - 'storperf-workloadagent': - project: 'storperf' - dockerdir: 'docker/storperf-workloadagent' - arch_tag: 'x86_64' - <<: *master - <<: *storperf-receivers - 'rapid': project: 'samplevnf' dockerdir: 'VNFs/DPPD-PROX/helper-scripts/rapid' @@ -251,50 +196,6 @@ <<: *master <<: *cirv-receivers - # projects with jobs for hunter - - 'dovetail': - project: 'dovetail' - <<: *hunter - <<: *other-receivers - - # projects with jobs for iruya - - 'storperf-master': - project: 'storperf' - dockerdir: 'docker/storperf-master' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - - 'storperf-graphite': - project: 'storperf' - dockerdir: 'docker/storperf-graphite' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - - 'storperf-httpfrontend': - project: 'storperf' - dockerdir: 'docker/storperf-httpfrontend' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - - 'storperf-reporting': - project: 'storperf' - dockerdir: 'docker/storperf-reporting' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - - 'storperf-swaggerui': - project: 'storperf' - dockerdir: 'docker/storperf-swaggerui' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - - 'storperf-workloadagent': - project: 'storperf' - dockerdir: 'docker/storperf-workloadagent' - arch_tag: 'x86_64' - <<: *iruya - <<: *storperf-receivers - # projects with jobs for jerma - 'barometer-collectd': project: 'barometer' @@ -491,6 +392,55 @@ <<: *moselle <<: *other-receivers + # projects with jobs for nile + - 'barometer-collectd': + project: 'barometer' + dockerdir: 'docker/barometer-collectd' + <<: *nile + <<: *other-receivers + - 'barometer-collectd-experimental': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-experimental/Dockerfile' + <<: *nile + <<: *other-receivers + - 'barometer-collectd-latest': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-latest/Dockerfile' + <<: *nile + <<: *other-receivers + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *nile + <<: *other-receivers + - 'barometer-grafana': + project: 'barometer' + dockerdir: 'docker/barometer-grafana' + <<: *nile + <<: *other-receivers + - 'barometer-influxdb': + project: 'barometer' + dockerdir: 'docker/barometer-influxdb' + <<: *nile + <<: *other-receivers + - 'barometer-kafka': + project: 'barometer' + dockerdir: 'docker/barometer-kafka' + <<: *nile + <<: *other-receivers + - 'barometer-ves': + project: 'barometer' + dockerdir: 'docker/barometer-ves' + <<: *nile + <<: *other-receivers + - 'barometer-snmp': + project: 'barometer' + dockerdir: 'docker/barometer-snmp' + <<: *nile + <<: *other-receivers + # yamllint enable rule:key-duplicates jobs: - "{dockerrepo}-docker-build-push-{stream}" diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml index e8fb8c918..0d713591f 100644 --- a/jjb/releng/releng-jobs.yaml +++ b/jjb/releng/releng-jobs.yaml @@ -3,7 +3,7 @@ name: releng-scm scm: - git: - url: 'https://gerrit.opnfv.org/gerrit/releng' + url: 'ssh://jenkins-ci@gerrit.opnfv.org:29418/releng' refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*' submodule: recursive: true @@ -191,6 +191,7 @@ - leguer - lakelse - moselle + - nile - v1.21 - v1.22 - v1.23 @@ -269,6 +270,9 @@ node: opnfv-build - stream-parameter: stream: '{stream}' + - string: + name: GIT_URL + default: ssh://$USER@gerrit.opnfv.org:29418/ triggers: - gerrit: trigger-on: diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh index bbb9257d7..917a4c721 100644 --- a/jjb/releng/releng-release-create-branch.sh +++ b/jjb/releng/releng-release-create-branch.sh @@ -44,7 +44,7 @@ fi run_merge(){ unset NEW_FILES if [[ $REF_EXISTS = true && "$JOB_NAME" =~ "merge" ]]; then - ssh -n -f -p 29418 gerrit.opnfv.org gerrit create-branch "$repo" "$branch" "$ref" + ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -n -f -p 29418 jenkins-ci@gerrit.opnfv.org gerrit create-branch "$repo" "$branch" "$ref" python3 releases/scripts/create_jobs.py -f $release_file NEW_FILES=$(git status --porcelain --untracked=no | cut -c4-) fi diff --git a/jjb/vineperf/vineperf.yaml b/jjb/vineperf/vineperf.yaml index e7c4c48ad..41e295854 100644 --- a/jjb/vineperf/vineperf.yaml +++ b/jjb/vineperf/vineperf.yaml @@ -15,11 +15,15 @@ branch: '{stream}' gs-pathname: '' disabled: false - - moselle: &moselle + - nile: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - lakelse: &lakelse + - moselle: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - lakelse: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/releases/nile/barometer.yaml b/releases/nile/barometer.yaml new file mode 100644 index 000000000..b607a49ec --- /dev/null +++ b/releases/nile/barometer.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2021 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: barometer +project-type: feature +release-model: stable + +branches: + - name: stable/nile + location: + barometer: 41195d4c2c3418e8c2daa44c792406be2fc54964 diff --git a/releases/nile/vineperf.yaml b/releases/nile/vineperf.yaml new file mode 100644 index 000000000..4a3ef2d4d --- /dev/null +++ b/releases/nile/vineperf.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 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: vineperf +project-type: testing +release-model: stable + +branches: + - name: stable/nile + location: + vineperf: 34147ac299351c44d4f7d135892457fba38a132b |