diff options
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 85 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-lint.yml | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 6 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 13 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 1 | ||||
| -rw-r--r-- | utils/test/reporting/functest/reportingConf.py | 4 | ||||
| -rw-r--r-- | utils/test/reporting/functest/testCase.py | 2 |
10 files changed, 114 insertions, 17 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 24ed84840..c6cfb26d1 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -72,7 +72,6 @@ if [[ "$BUILD_DIRECTORY" == *verify* ]]; then DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy" NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network" DEPLOY_CMD="$(pwd)/deploy.sh" - UTIL_CMD="$(pwd)/util.sh" RESOURCES="${WORKSPACE}/build/images/" CONFIG="${WORKSPACE}/build" LIB="${WORKSPACE}/lib" @@ -130,7 +129,6 @@ else DEPLOY_CMD=opnfv-deploy DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/" - UTIL_CMD=opnfv-util NETWORK_SETTINGS_DIR="/etc/opnfv-apex/" RESOURCES="/var/opt/opnfv/images" CONFIG="/var/opt/opnfv" @@ -139,7 +137,6 @@ fi # set env vars to deploy cmd DEPLOY_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${DEPLOY_CMD}" -UTIL_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${UTIL_CMD}" if [ "$OPNFV_CLEAN" == 'yes' ]; then if [[ "$BUILD_DIRECTORY" == *verify* ]]; then @@ -193,12 +190,8 @@ if ! sudo test -e "$NETWORK_FILE"; then exit 1 fi -# mock detached state for deploy -sudo $UTIL_CMD mock-detached on # start deployment sudo ${DEPLOY_CMD} -d ${DEPLOY_FILE} -n ${NETWORK_FILE} --debug -# turn of mock detached state -sudo $UTIL_CMD mock-detached off echo echo "--------------------------------------------------------" diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index b9e201d46..8648d23a2 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -32,6 +32,9 @@ - zte-pod1: slave-label: zte-pod1 <<: *master + - zte-pod2: + slave-label: zte-pod2 + <<: *master - zte-pod3: slave-label: zte-pod3 <<: *master @@ -199,6 +202,9 @@ wrappers: - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 150 + abort: true builders: - description-setter: @@ -470,6 +476,82 @@ - timed: '' #----------------------------------------------- +# ZTE POD2 Triggers running against master branch +#----------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '0 10 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +# NOHA Scenarios +- trigger: + name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-master-trigger' + triggers: + - timed: '' +#----------------------------------------------- # ZTE POD3 Triggers running against master branch #----------------------------------------------- - trigger: @@ -544,4 +626,5 @@ - trigger: name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-master-trigger' triggers: - - timed: ''
\ No newline at end of file + - timed: '' + diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 8d6ade27d..3109fcb6e 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -119,6 +119,10 @@ slave-label: '{pod}' installer: fuel <<: *master + - zte-pod2: + slave-label: '{pod}' + installer: fuel + <<: *master - zte-pod3: slave-label: '{pod}' installer: fuel diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/opnfv/opnfv-lint.yml index 9611a380c..cda882e32 100644 --- a/jjb/opnfv/opnfv-lint.yml +++ b/jjb/opnfv/opnfv-lint.yml @@ -51,7 +51,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'functest|sdnvpn|qtip' + project-pattern: 'functest|sdnvpn|qtip|daisy' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 4d73ad807..3407cd73c 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -352,8 +352,12 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: INSTALLER_IP - default: '10.20.1.2' + default: '10.20.7.2' description: 'IP of the installer' + - string: + name: BRIDGE + default: 'br7' + description: 'pxe bridge for booting of Fuel master' - parameter: name: 'zte-pod3-defaults' parameters: diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index ef455f8df..1123d27fb 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -40,11 +40,11 @@ auto-trigger-name: 'daily-trigger-disabled' - zte-pod1: installer: fuel - auto-trigger-name: 'qtip-daily-zte-pod1-trigger' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - zte-pod2: installer: fuel - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'qtip-daily-zte-pod2-trigger' <<: *master #-------------------------------- @@ -188,6 +188,7 @@ # - timed : ' 0 0 * * *' - trigger: - name: 'qtip-daily-zte-pod1-trigger' + name: 'qtip-daily-zte-pod2-trigger' triggers: - timed: '0 5 * * *' + diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 4442376fe..f952ed337 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -121,6 +121,11 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master + - zte-pod2: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master - zte-pod3: slave-label: '{pod}' installer: fuel @@ -323,6 +328,14 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-zte-pod2' + 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-zte-pod3' parameters: - string: diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index e11df599b..47fbc91dc 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -142,7 +142,6 @@ elif [ "$installer_type" == "compass" ]; then sshpass -p root ssh 2>/dev/null $ssh_options root@${installer_ip} \ "scp $ssh_options ${controller_ip}:/opt/admin-openrc.sh ." &> /dev/null sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:~/admin-openrc.sh $dest_path &> /dev/null - echo 'export OS_REGION_NAME=regionOne' >> $dest_path info "This file contains the mgmt keystone API, we need the public one for our rc file" public_ip=$(sshpass -p root ssh $ssh_options root@${installer_ip} \ diff --git a/utils/test/reporting/functest/reportingConf.py b/utils/test/reporting/functest/reportingConf.py index 9c618a274..1c0b0577d 100644 --- a/utils/test/reporting/functest/reportingConf.py +++ b/utils/test/reporting/functest/reportingConf.py @@ -12,7 +12,7 @@ installers = ["apex", "compass", "fuel", "joid"] # list of test cases declared in testcases.yaml but that must not be # taken into account for the scoring -blacklist = ["ovno", "security_scan"] +blacklist = ["ovno", "odl", "security_scan"] # versions = ["brahmaputra", "master"] versions = ["master"] PERIOD = 50 @@ -23,5 +23,5 @@ NB_TESTS = 5 REPORTING_PATH = "." URL_BASE = 'http://testresults.opnfv.org/test/api/v1/results' TEST_CONF = "https://git.opnfv.org/cgit/functest/plain/ci/testcases.yaml" -LOG_LEVEL = "DEBUG" +LOG_LEVEL = "ERROR" LOG_FILE = REPORTING_PATH + "/reporting.log" diff --git a/utils/test/reporting/functest/testCase.py b/utils/test/reporting/functest/testCase.py index e97303533..d6c19930f 100644 --- a/utils/test/reporting/functest/testCase.py +++ b/utils/test/reporting/functest/testCase.py @@ -126,7 +126,7 @@ class TestCase(object): 'doctor': 'doctor-notification', 'promise': 'promise', 'moon': 'moon', - 'copper': 'copper', + 'copper': 'copper-notification', 'security_scan': 'security', 'multisite': 'multisite', 'domino': 'domino-multinode', |