diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 8 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.yml | 1 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/pod-params.yml | 101 |
5 files changed, 97 insertions, 19 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index dc11fbd53..26feee43d 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -15,7 +15,7 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: CONTROLLER - default: '{controller}' + default: none description: 'Controller name' - parameter: @@ -35,7 +35,7 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: CONTROLLER - default: '{controller}' + default: none description: 'Controller name' - parameter: @@ -55,7 +55,7 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: CONTROLLER - default: '{controller}' + default: none description: 'Controller name' - parameter: @@ -75,5 +75,5 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: CONTROLLER - default: '{controller}' + default: none description: 'Controller name' diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index 2b42938c0..6f0a0c35c 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -64,6 +64,8 @@ if [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then cd $WORKSPACE/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then cd $WORKSPACE/ci/docker/yardstick-ci +elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then + cd $WORKSPACE/docker else echo "ERROR: DOCKER_REPO_NAME parameter not valid: $DOCKER_REPO_NAME" exit 1 diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index 46a05230b..83ebab7af 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -9,6 +9,7 @@ project: - 'functest' - 'yardstick' + - 'storperf' jobs: - '{project}-docker-build-push-{stream}' diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index b6c186336..841ce2e3d 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -51,7 +51,7 @@ projects: - project-compare-type: 'REG_EXP' #Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf' branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' @@ -85,7 +85,7 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf' branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index fb02e7d5d..fc6650ffb 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -1,5 +1,5 @@ - parameter: - name: 'lf-pod1-defaults' + name: 'opnfv-jump-1-defaults' parameters: - node: name: SLAVE_NAME @@ -22,7 +22,7 @@ description: 'SSH key to use for Apex' - parameter: - name: 'lf-pod2-defaults' + name: 'opnfv-jump-2-defaults' parameters: - node: name: SLAVE_NAME @@ -38,8 +38,38 @@ - string: name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT - description: 'Git URL for LF POD2' description: 'Git URL to use on the jumphost' + - string: + name: YARDSTICK_TEST_SUITE + default: opnfv_${{NODE_NAME}}_{loop}.yaml + description: 'Path to test suite' + - string: + name: YARDSTICK_DB_BACKEND + default: 'db_args' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'ericsson-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - ericsson-pod1 + default-slaves: + - ericsson-pod1 + - string: + name: INSTALLER_VERSION + default: latest + description: 'Version of the installer to deploy' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the jumphost' + - string: + name: YARDSTICK_TEST_SUITE + default: opnfv_${{NODE_NAME}}_{loop}.yaml + description: 'Path to test suite' - parameter: name: 'ericsson-pod2-defaults' @@ -48,9 +78,9 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - ericsson-ca-fuel-bare-1 + - ericsson-pod2 default-slaves: - - ericsson-ca-fuel-bare-1 + - ericsson-pod2 - string: name: INSTALLER_VERSION default: latest @@ -61,7 +91,7 @@ description: 'Git URL to use on the jumphost' - parameter: - name: 'intel-pod2-defaults' + name: 'intelpod2-jumphost-defaults' parameters: - node: name: SLAVE_NAME @@ -90,9 +120,9 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intelpod5-jumphost + - intel-pod5 default-slaves: - - intelpod5-jumphost + - intel-pod5 - string: name: INSTALLER_VERSION default: stable @@ -109,9 +139,9 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intelpod6-jumphost + - intel-pod6 default-slaves: - - intelpod6-jumphost + - intel-pod6 - string: name: INSTALLER_VERSION default: latest @@ -128,9 +158,9 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intelpod8-jumphost + - intel-pod8 default-slaves: - - intelpod8-jumphost + - intel-pod8 - string: name: INSTALLER_VERSION default: latest @@ -141,7 +171,7 @@ description: 'Git URL to use on the jumphost' - parameter: - name: 'huawei-sc-pod1-defaults' + name: 'huawei-us-deploy-bare-1-defaults' parameters: - node: name: SLAVE_NAME @@ -158,3 +188,48 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on the jumphost' + +- parameter: + name: 'intel-us-build-1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-build-1 + default-slaves: + - intel-us-build-1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the slave' + +- parameter: + name: 'intel-us-build-2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-build-2 + default-slaves: + - intel-us-build-2 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the slave' + +- parameter: + name: 'ericsson-ca-build-1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - ericsson-ca-build-1 + default-slaves: + - ericsson-ca-build-1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the slave' |