summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 14:37:40 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 14:55:48 +0000
commite8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 (patch)
tree0ae6865789e89d1dc8632b6d7b04f6a4697d0487 /jjb/fuel
parent324a87b519694309d141bbec8d15726d9cc1adb8 (diff)
Enable fuel nosdn scenario for master and stable/brahmaputra
This patch proposes below changes: - Run CI on opnfv-jump-2 against stable/brahmaputra branch - Run CI on ericsson-pod2 against master branch - Configure functest against both branches on both PODs - Enable yardstick against both branches on both PODs - Comment out additional controllers until nosdn scenario is verified - Rename OPNFV_FEATURE to DEPLOY_SCENARIO Change-Id: Ie3d4f946cd51271378b435f9a92af07aaf614c26 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel')
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml51
-rwxr-xr-xjjb/fuel/fuel-deploy-virtual.sh7
-rwxr-xr-xjjb/fuel/fuel-deploy.sh18
-rw-r--r--jjb/fuel/fuel-project-jobs.yml9
4 files changed, 38 insertions, 47 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 888287909..1b4b26963 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -2,9 +2,9 @@
name: 'fuel'
- project: 'fuel'
+ project: '{name}'
- installer: 'fuel'
+ installer: '{name}'
#--------------------------------
# BRANCH ANCHORS
@@ -20,36 +20,31 @@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# Current Mapping
-#--------------------------------
-# everything runs against master branch
+# brahmaputra
#--------------------------------
pod:
- opnfv-jump-2:
- <<: *master
+ <<: *brahmaputra
+#--------------------------------
+# master
+#--------------------------------
- ericsson-pod1:
<<: *master
- ericsson-pod2:
<<: *master
#--------------------------------
-# Milestone E Mapping
-# !!!DO NOT ENABLE!!!
-#--------------------------------
-# brahmaputra
-#--------------------------------
-# - opnfv-jump-2:
-# <<: *brahmaputra
# please check the triggers before enabling any of the controllers!!!
sdn-controller:
- 'nosdn':
disabled: false
- - 'odl':
- disabled: true
- - 'onos':
- disabled: true
- - 'opencontrail':
- disabled: true
+# commented out below controllers to get nosdn scenario settled first
+# - 'odl':
+# disabled: true
+# - 'onos':
+# disabled: true
+# - 'opencontrail':
+# disabled: true
jobs:
- 'fuel-{sdn-controller}-{pod}-daily-{stream}'
@@ -75,10 +70,10 @@
wrappers:
- build-name:
- name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
+ name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
triggers:
- - 'fuel-{pod}-trigger'
+ - 'fuel-{pod}-{sdn-controller}-trigger'
parameters:
- project-parameter:
@@ -89,7 +84,7 @@
name: SDN_CONTROLLER
default: '{sdn-controller}'
- string:
- name: OPNFV_FEATURE
+ name: DEPLOY_SCENARIO
default: 'none'
- fuel-ci-parameter:
gs-pathname: '{gs-pathname}'
@@ -151,7 +146,7 @@
wrappers:
- build-name:
- name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
+ name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
builders:
- shell:
@@ -186,14 +181,14 @@
# trigger for opnfv-jump-2 is set to run 1 hour ahead of others
# to prevent doing unnecessary builds
- trigger:
- name: 'fuel-opnfv-jump-2-trigger'
+ name: 'fuel-opnfv-jump-2-nosdn-trigger'
triggers:
- timed: '0 2 * * *'
- trigger:
- name: 'fuel-ericsson-pod1-trigger'
+ name: 'fuel-ericsson-pod1-nosdn-trigger'
triggers:
- - timed: '0 3 * * *'
+ - timed: '0 2 * * *'
- trigger:
- name: 'fuel-ericsson-pod2-trigger'
+ name: 'fuel-ericsson-pod2-nosdn-trigger'
triggers:
- - timed: '0 3 * * *'
+ - timed: '0 2 * * *'
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
index 7c25812ec..8e9282373 100755
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ b/jjb/fuel/fuel-deploy-virtual.sh
@@ -9,6 +9,11 @@ source latest.properties
# echo the info about artifact that is used during the deployment
echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f3) for deployment"
+# checkout the commit that was used for building the downloaded artifact
+# to make sure the ISO and deployment mechanism uses same versions
+echo "Checking out $OPNFV_GIT_SHA1"
+git checkout $OPNFV_GIT_SHA1 --quiet
+
# create TMPDIR if it doesn't exist
export TMPDIR=$HOME/tmpdir
mkdir -p $TMPDIR
@@ -19,7 +24,7 @@ chmod a+x $TMPDIR
# get the lab name from SLAVE_NAME
# we currently support ericsson and intel labs
-LAB_NAME=${{SLAVE_NAME%%-*}}
+LAB_NAME=${{NODE_NAME%%-*}}
if [[ ! "$LAB_NAME" =~ (ericsson|intel) ]]; then
echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
exit 1
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index bd2db3e65..334307448 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -9,6 +9,11 @@ source latest.properties
# echo the info about artifact that is used during the deployment
echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f3) for deployment"
+# checkout the commit that was used for building the downloaded artifact
+# to make sure the ISO and deployment mechanism uses same versions
+echo "Checking out $OPNFV_GIT_SHA1"
+git checkout $OPNFV_GIT_SHA1 --quiet
+
# create TMPDIR if it doesn't exist
export TMPDIR=$HOME/tmpdir
mkdir -p $TMPDIR
@@ -20,19 +25,6 @@ chmod a+x $TMPDIR
# set BRIDGE
BRIDGE=pxebr
-# clone genesis repo and checkout the SR1 tag
-#echo "Cloning genesis repo"
-#cd $WORKSPACE
-#GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/genesis genesis
-#cd genesis
-#git checkout arno.2015.2.0
-
-# cleanup first
-#sudo $WORKSPACE/genesis/common/ci/clean.sh -base_config $WORKSPACE/genesis/foreman/ci/inventory/lf_pod2_ksgen_settings.yml
-
-# prepare for Fuel Deployment
-#sudo $WORKSPACE/genesis/common/ci/setup.sh
-
# log info to console
echo "Starting the deployment using $INSTALLER_TYPE. This could take some time..."
echo "--------------------------------------------------------"
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 50df1bdd2..848fd0b21 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -8,14 +8,13 @@
installer: 'fuel'
-# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: '{stream}'
gs-pathname: ''
-# - brahmaputra:
-# branch: 'stable/{stream}'
-# gs-pathname: '/{stream}'
+ - brahmaputra:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
jobs:
- 'fuel-build-daily-{stream}'
@@ -52,7 +51,7 @@
branch: '{branch}'
triggers:
- - pollscm: '0 H/6 * * *'
+ - pollscm: '0 H/4 * * *'
wrappers:
- timeout: