Merge "Adjust bifrost node provisioning timeout and fix file permissions"

diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh
index 7b72958..e3e3f61 100755 (executable)
--- a/jjb/apex/apex-build.sh
+++ b/jjb/apex/apex-build.sh
@@ -23,7 +23,7 @@ fi
 # start the build
 cd $WORKSPACE/ci
 ./build.sh $BUILD_ARGS
-RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
+RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
 # list the contents of BUILD_OUTPUT directory
 echo "Build Directory is ${BUILD_DIRECTORY}"
 echo "Build Directory Contents:"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 1655dc4..4650fcd 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -55,6 +55,7 @@
          - 'os-nosdn-nofeature-noha'
          - 'os-nosdn-nofeature-ha'
          - 'os-nosdn-nofeature-ha-ipv6'
+         - 'os-nosdn-ovs-noha'
          - 'os-nosdn-fdio-noha'
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
@@ -992,6 +993,36 @@
             block-thresholds:
                 build-step-failure-threshold: 'never'
             block: true
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-ovs-noha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-ovs-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-ovs-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'

diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 764a5d4..46cc76b 100644 (file)
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -7,6 +7,8 @@
 
     project: '{name}'
 
+    installer: 'fuel'
+
     jobs:
         - 'armband-verify-{stream}'
         - 'armband-build-daily-{stream}'
@@ -77,6 +79,7 @@
         - project-parameter:
             project: '{project}'
         - 'opnfv-build-arm-defaults'
+        - '{installer}-defaults'
         - armband-project-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -103,7 +106,7 @@
 
     publishers:
         - email:
-            recipients: josep.puigdemont@enea.com armband@enea.com
+            recipients: armband@enea.com
 
 ########################
 # parameter macros
@@ -115,6 +118,10 @@
             name: BUILD_DIRECTORY
             default: $WORKSPACE/build_output
             description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: CACHE_DIRECTORY
+            default: $HOME/opnfv/cache/$INSTALLER_TYPE
+            description: "Directory where the cache to be used during the build is located."
         - string:
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index eb30004..efd1fc1 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -48,27 +48,35 @@
         - 'os-nosdn-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l2-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l3-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-onos-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-ocl-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-onos-sfc-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
         - 'os-odl_l2-moon-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: 'xenial'
         - 'os-nosdn-kvm-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+            openstack-os-version: ''
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -122,6 +130,7 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
                 COMPASS_OS_VERSION={os-version}
+                COMPASS_OS_VERSION_OPTION={openstack-os-version}
               same-node: true
               block: true
         - trigger-builds:

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3109fcb..7afd7d1 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -91,10 +91,10 @@
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
-            <<: *brahmaputra
+            <<: *master
         - orange-pod5:
             slave-label: '{pod}'
             installer: fuel
@@ -168,8 +168,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
         - string:
             name: DEPLOY_SCENARIO

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 1c998c9..cf4d9cc 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -16,10 +16,6 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -32,18 +28,12 @@
         - virtual:
             slave-label: joid-virtual
             <<: *master
-        - baremetal:
-            slave-label: joid-baremetal
-            <<: *brahmaputra
-        - virtual:
-            slave-label: joid-virtual
-            <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
-            slave-label: orange-pod2
-            <<: *brahmaputra
+        - orange-pod1:
+            slave-label: orange-pod1
+            <<: *master
         - orange-pod2:
             slave-label: orange-pod2
             <<: *master
@@ -54,11 +44,11 @@
 # new scenario descriptions
     scenario:
         - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-nofeature-ha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-lxd-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-lxd-noha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
@@ -223,29 +213,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-nosdn-nofeature-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -259,29 +235,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-odl_l2-nofeature-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -294,6 +256,10 @@
     name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger'
     triggers:
@@ -313,45 +279,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-onos-nofeature-ha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-orange-pod2-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -365,29 +301,15 @@
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
-    triggers:
-        - timed: ''
-
-# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''
 
@@ -400,6 +322,10 @@
     name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger'
     triggers:
@@ -409,20 +335,24 @@
     triggers:
         - timed: ''
 
-# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra
+# os-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 4 * * *'
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-master-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index da3676e..575a573 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -10,10 +10,8 @@
 set +e
 set -o nounset
 
-PWD_FILENAME="passwords.sh"
-
-##
 ##
+## Functions
 ##
 function exit_on_error {
     RES=$1
@@ -24,50 +22,23 @@ function exit_on_error {
     fi
 }
 
-
 ##
 ## Create LAB_CONFIG folder if not exists
 ##
-mkdir -p $LAB_CONFIG
-
-##
-## Override default passwords with local settings if needed
-##
 
-if [ -e "$LAB_CONFIG/$PWD_FILENAME" ]; then
-    echo "------ Load local passwords ------"
-    source $LAB_CONFIG/$PWD_FILENAME
-else
-    export MAAS_USER=ubuntu
-    export MAAS_PASSWORD=ubuntu
-    export OS_ADMIN_PASSWORD=openstack
-fi
+mkdir -p $LAB_CONFIG
 
 ##
 ## Set Joid pod config name
 ##
-    # This part will be removed when pod names will be synced between jenkins and joid config
-    case $NODE_NAME in
-        *virtual*)
-            POD=default ;;
-        *)
-            POD=$NODE_NAME ;;
-    esac
-    export POD_NAME=${POD/-}
 
-##
-## Parse Network config
-##
-
-EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-}
-# split EXTERNAL_NETWORK=name;type;first ip;last ip; gateway;network
-IFS=';' read -r -a EXTNET <<< "$EXTERNAL_NETWORK"
-EXTNET_NAME=${EXTNET[0]}
-EXTNET_TYPE=${EXTNET[1]}
-EXTNET_FIP=${EXTNET[2]}
-EXTNET_LIP=${EXTNET[3]}
-EXTNET_GW=${EXTNET[4]}
-EXTNET_NET=${EXTNET[5]}
+case $NODE_NAME in
+    *virtual*)
+        POD=default ;;
+    *)
+        POD=$NODE_NAME ;;
+esac
+export POD_NAME=${POD/-}
 
 ##
 ## Redeploy MAAS or recover the previous config
@@ -77,11 +48,11 @@ cd $WORKSPACE/ci
 if [ -e "$LAB_CONFIG/environments.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
     echo "------ Recover Juju environment to use MAAS ------"
     cp $LAB_CONFIG/environments.yaml .
+    cp $LAB_CONFIG/deployment.yaml .
+    if [ -e $LAB_CONFIG/deployconfig.yaml ]; then
+        cp $LAB_CONFIG/deployconfig.yaml .
+    fi
 else
-    MAASCONFIG=$WORKSPACE/ci/maas/${POD/-*}/${POD/*-}/deployment.yaml
-    echo "------ Set MAAS password ------"
-    sed -i -- "s/user: ubuntu/user: $MAAS_USER/" $MAASCONFIG
-    sed -i -- "s/password: ubuntu/password: $MAAS_PASSWORD/" $MAASCONFIG
     echo "------ Redeploy MAAS ------"
     ./00-maasdeploy.sh $POD_NAME
     exit_on_error $? "MAAS Deploy FAILED"
@@ -117,27 +88,10 @@ fi
 if [ "$HA_MODE" == 'noha' ]; then
     HA_MODE='nonha'
 fi
-SRCBUNDLE="${WORKSPACE}/ci/${SDN_CONTROLLER}/juju-deployer/"
-SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml"
-
-
-# Modify Bundle
-echo "------ Set openstack password ------"
-sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRCBUNDLE
-
-if [ -n "$EXTNET_NAME" ]; then
-    echo "------ Set openstack default network ------"
-    sed -i -- "s/neutron-external-network: ext_net/neutron-external-network: $EXTNET_NAME/" $SRCBUNDLE
-fi
-
-echo "------ Set ceph disks ------"
-#Find the first line of osd-devices to change the one for ceph, then the other for ceph-osd
-sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
-sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
 
-# temporary sfc feature is availble only on onos and trusty
-if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
-    UBUNTU_DISTRO=trusty
+# Add extra to features
+if [ "$EXTRA" != "" ];then
+    NFV_FEATURES="${NFV_FEATURES}_${EXTRA}"
 fi
 
 ##
@@ -156,17 +110,6 @@ exit_on_error $? "Main deploy FAILED"
 JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
 echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
 
-# get Keystone ip
-case "$HA_MODE" in
-    "ha")
-        KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase1.services.keystone.options.vip)
-        ;;
-    *)
-        KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
-        ;;
-esac
-
-
 # get controller IP
 case "$SDN_CONTROLLER" in
     "odl")
@@ -181,22 +124,12 @@ case "$SDN_CONTROLLER" in
 esac
 SDN_PASSWORD='admin'
 
-# export the openrc file
-cat << EOF > $JOID_ADMIN_OPENRC
-export OS_USERNAME=admin
-export OS_PASSWORD=$OS_ADMIN_PASSWORD
-export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://$KEYSTONE:35357/v2.0
-export OS_REGION_NAME=RegionOne
-export OS_ENDPOINT_TYPE='adminURL'
-export CINDER_ENDPOINT_TYPE='adminURL'
-export GLANCE_ENDPOINT_TYPE='adminURL'
-export KEYSTONE_ENDPOINT_TYPE='adminURL'
-export NEUTRON_ENDPOINT_TYPE='adminURL'
-export NOVA_ENDPOINT_TYPE='adminURL'
+# export the openrc file by getting the one generated by joid and add SDN
+# controller for Functest
+cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
+cat << EOF >> $JOID_ADMIN_OPENRC
 export SDN_CONTROLLER=$SDN_CONTROLLER_IP
 export SDN_PASSWORD=$SDN_PASSWORD
-export OS_INTERFACE=admin
 EOF
 
 ##
@@ -205,28 +138,10 @@ EOF
 
 echo "------ Backup Juju environment ------"
 cp environments.yaml $LAB_CONFIG/
-
-##
-## Basic test to return a realistic result to jenkins
-##
-
-echo "------ Do basic test ------"
-source $JOID_ADMIN_OPENRC
-curl -i -sw '%{http_code}' -H "Content-Type: application/json"   -d "
-{ \"auth\": {
-    \"identity\": {
-      \"methods\": [\"password\"],
-      \"password\": {
-        \"user\": {
-          \"name\": \"admin\",
-          \"domain\": { \"id\": \"default\" },
-          \"password\": \"$OS_ADMIN_PASSWORD\"
-        }
-      }
-    }
-  }
-}"   http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null;
-exit_on_error $? "Deploy FAILED to auth to openstack"
+cp deployment.yaml $LAB_CONFIG/
+if [ -e deployconfig.yaml ]; then
+    cp deployconfig.yaml $LAB_CONFIG
+fi
 
 ##
 ## Exit success

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index b795408..833a1d4 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -1,23 +1,3 @@
-- parameter:
-    name: 'armband-defaults'
-    parameters:
-        - string:
-            name: INSTALLER_IP
-            default: '10.20.0.2'
-            description: 'IP of the installer'
-        - string:
-            name: INSTALLER_TYPE
-            default: fuel
-            description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: EXTERNAL_NETWORK
-            default: 'admin_floating_net'
-            description: 'external network for test'
-        - string:
-            name: BRIDGE
-            default: 'pxebr'
-            description: 'pxe bridge for booting of Fuel master'
-
 - parameter:
     name: 'apex-defaults'
     parameters:

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 641ae4e..7c2d5c7 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -402,6 +402,28 @@
             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'
+        - string:
+            name: CEPH_DISKS
+            default: /dev/sdb /dev/sdc
+            description: "Disks to use by ceph by default (space separated list)"
+        - string:
+            name: EXTERNAL_NETWORK
+            default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
+            description: "External network to create (name;type;first ip;last ip; gateway;network)"
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c8d50a0..a77b5c6 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -111,11 +111,11 @@
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *master
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
@@ -192,8 +192,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'yardstick-params-{slave-label}'
         - string:
             name: DEPLOY_SCENARIO
@@ -348,6 +348,14 @@
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-orange-pod1'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: '-i 104.197.68.199:8086'
+            description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-orange-pod2'
     parameters:

diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index ecd05e0..807d823 100755 (executable)
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@ -33,6 +33,7 @@ BUILD_IMAGE=true
 TEST_VM_NUM_NODES=3
 export TEST_VM_NODE_NAMES="jumphost.opnfvlocal controller00.opnfvlocal compute00.opnfvlocal"
 export VM_DOMAIN_TYPE="kvm"
+export VM_CPU=4
 TEST_PLAYBOOK="test-bifrost-infracloud.yaml"
 USE_INSPECTOR=true
 USE_CIRROS=false