diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 51 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 7 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 18 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 14 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 6 |
7 files changed, 48 insertions, 63 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: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index f844b1631..725dd899d 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -23,6 +23,9 @@ # brahmaputra #-------------------------------- pod: + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra @@ -38,9 +41,6 @@ - intel-us-deploy-virtual-2: installer: apex <<: *master - - opnfv-jump-2: - installer: fuel - <<: *master - ericsson-pod1: installer: fuel <<: *master diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 43edcc2ca..002ab7e52 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -331,19 +331,13 @@ - parameter: name: 'fuel-deploy-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-us-deploy-virtual-1 - - ericsson-ca-deploy-virtual-1 - default-slaves: - - intel-us-deploy-virtual-1 - - ericsson-ca-deploy-virtual-1 + - label: + name: SLAVE_LABEL + default: 'fuel-deploy-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' + description: 'Git URL to use on these Jenkins Slaves' - parameter: name: 'intel-us-deploy-virtual-2-defaults' diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index fb05b3336..f88a399bc 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -23,15 +23,15 @@ # brahmaputra #-------------------------------- pod: + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra #-------------------------------- # master #-------------------------------- - - opnfv-jump-2: - installer: fuel - <<: *master - ericsson-pod1: installer: fuel <<: *master |