summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/bottlenecks/bottlenecks.yml160
-rwxr-xr-xjjb/fuel/fuel-deploy-virtual.sh2
-rw-r--r--jjb/fuel/fuel.yml7
-rw-r--r--jjb/functest/functest.yml6
-rw-r--r--jjb/storperf/storperf.yml6
5 files changed, 134 insertions, 47 deletions
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index a1687c38c..b2d74eba7 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -6,11 +6,20 @@
jobs:
- 'bottlenecks-test'
- 'bottlenecks-verify'
- - 'bottlenecks-daily-{stream}'
- 'bottlenecks-merge'
+ - 'bottlenecks-daily-{installer}-{pod}-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
+ pod:
+ - lf:
+ node: 'opnfv-jump-2'
+ installer_type: 'fuel'
+ installer_ip: '10.20.0.2'
+
+ installer:
+ -fuel
+
stream:
- master:
branch: 'master'
@@ -34,46 +43,7 @@
echo "Hello world from bottlenecks"
- job-template:
- name: 'bottlenecks-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
- parameters:
- - project-parameter:
- project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- echo "hello world"
-
- postbuilders:
- - test-macro
-- job-template:
name: 'bottlenecks-verify'
logrotate:
@@ -123,6 +93,12 @@
#
# This job's purpose is to update all the JJB
+ logrotate:
+ daysToKeep: 30
+ numToKeep: 40
+ artifactDaysToKeep: -1
+ artifactNumToKeep: 5
+
parameters:
- project-parameter:
project: '{project}'
@@ -152,3 +128,107 @@
- shell: |
echo "hello world"
+- job-template:
+ name: 'bottlenecks-daily-{installer}-{pod}-{stream}'
+
+ disabled: false
+
+ node: '{node}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - '{pod}-parameters'
+ - string:
+ name: POD_NAME
+ default: '{pod}'
+ description: "POD where the job runs"
+ - string:
+ name: INSTALLER_TYPE
+ default: '{installer_type}'
+ description: "Installer name that is used for deployment."
+ - string:
+ name: INSTALLER_IP
+ default: '{installer_ip}'
+ description: "Installer IP."
+
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
+ logrotate:
+ daysToKeep: 30
+ numToKeep: 10
+ artifactDaysToKeep: -1
+ artifactNumToKeep: -1
+
+ triggers:
+ - 'bottlenecks-trigger-{pod}'
+
+ builders:
+ - 'bottlenecks-fetch-os-creds'
+ - 'run-rubbos-env-preparation'
+ - 'run-rubbos-tools-installation'
+ - 'rubbos-exec'
+
+ publishers:
+ - email:
+ recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com
+
+###################################
+#builders for bottlenecks project
+###################################
+- builder:
+ name: bottlenecks-fetch-os-creds
+ builders:
+ - shell:
+ !include-raw ../../utils/fetch_os_creds.sh
+
+- builder:
+ name: run-rubbos-env-preparation
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+
+ echo "Bottlenecks: export openstack parameters before rubbos running"
+
+ cd $WORKSPACE
+ ./rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+
+- builder:
+ name: run-rubbos-tools-installation
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+
+ echo "Bottlenecks: to install tools to run rubbos"
+
+ cd $WORKSPACE
+ ./rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+
+- builder:
+ name: rubbos-exec
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+
+ echo "Bottlenecks: rubbos execution"
+
+ cd $WORKSPACE
+ cd ./rubbos/rubbos_scripts/1-1-1
+ source set_bottlenecks_rubbos_env.sh
+ ssh $CONTROL_HOST
+ ./tmp/CONTROL_rubbos_exec.sh
+
+#######################
+#trigger macros
+#######################
+- trigger:
+ name: 'bottlenecks-trigger-lf'
+ triggers:
+ - timed: '@midnight'
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
index a65395b07..626a65060 100755
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ b/jjb/fuel/fuel-deploy-virtual.sh
@@ -18,7 +18,7 @@ chmod a+x $HOME
chmod a+x $TMPDIR
# set CONFDIR, BRIDGE
-CONFDIR=$WORKSPACE/deploy/templates/virtual_environment/conf
+CONFDIR=$WORKSPACE/deploy/templates/virtual_environment_noha/conf
BRIDGE=pxebr
# log info to console
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index e7ad2bd9c..97fc9ed3f 100644
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -250,6 +250,13 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'bottlenecks-daily-fuel-lf-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
triggers:
- 'fuel-{stream}-daily-trigger'
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 17a6db85f..53da3eec5 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -477,10 +477,10 @@
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
docker pull opnfv/functest:latest_stable
echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &"
- docker run -i -e $envs opnfv/functest /bin/bash &
+ docker run -i -e $envs opnfv/functest:latest_stable /bin/bash &
docker ps -a
sleep 5
- container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+ container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
if [ -z ${container_id} ]; then
echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -491,7 +491,7 @@
docker start ${container_id}
sleep 5
docker ps
- if [ $(docker ps | grep opnfv/functest | wc -l) == 0 ]; then
+ if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 78c2471bd..1b2d4060c 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -16,7 +16,7 @@
- job-template:
name: 'storperf-verify-{stream}'
- node: intel-jp-build-1
+ node: opnfv-build
logrotate:
daysToKeep: 30
@@ -70,7 +70,7 @@
#
# This job's purpose is to update all the JJB
- node: intel-jp-build-1
+ node: opnfv-build
parameters:
- project-parameter:
@@ -117,7 +117,7 @@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: intel-jp-build-1
+ node: opnfv-build
disabled: true