summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex.yml55
-rw-r--r--jjb/apex/scenarios.yaml.hidden5
-rw-r--r--jjb/ci_gate_security/anteater-report-to-gerrit.sh8
-rw-r--r--jjb/ci_gate_security/anteater-security-audit.sh4
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yml4
-rwxr-xr-xjjb/dovetail/dovetail-run.sh3
-rw-r--r--utils/push-test-logs.sh3
-rwxr-xr-xutils/test/testapi/docker/prepare-env.sh1
-rw-r--r--utils/test/testapi/etc/config.ini3
-rw-r--r--utils/test/testapi/opnfv_testapi/cmd/server.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/noparam.ini4
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/normal.ini4
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/nosection.ini4
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/notboolean.ini4
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/notint.ini4
-rw-r--r--utils/test/testapi/opnfv_testapi/tests/unit/common/test_config.py2
16 files changed, 88 insertions, 22 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index d4ae54f9f..4f2047c2e 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -118,6 +118,16 @@
<<: *master
- 'os-nosdn-bar-noha':
<<: *master
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *master
+ - 'os-nosdn-ovs_dpdk-noha':
+ <<: *master
+ - 'os-nosdn-ovs_dpdk-ha':
+ <<: *master
+ - 'os-nosdn-kvm_ovs_dpdk-noha':
+ <<: *master
+ - 'os-nosdn-kvm_ovs_dpdk-ha':
+ <<: *master
platform:
- 'baremetal'
@@ -1255,6 +1265,51 @@
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+ - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+ - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+ - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
+ - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+
# snapshot create
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index efb2a36f7..9dff6a62c 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -11,6 +11,11 @@ master:
- 'os-odl-fdio-ha'
- 'os-nosdn-bar-ha'
- 'os-nosdn-bar-noha'
+ - 'os-nosdn-nofeature-ha-ipv6'
+ - 'os-nosdn-ovs_dpdk-noha'
+ - 'os-nosdn-ovs_dpdk-ha'
+ - 'os-nosdn-kvm_ovs_dpdk-noha'
+ - 'os-nosdn-kvm_ovs_dpdk-ha'
danube:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/ci_gate_security/anteater-report-to-gerrit.sh b/jjb/ci_gate_security/anteater-report-to-gerrit.sh
index fc3018fb4..00a78ceba 100644
--- a/jjb/ci_gate_security/anteater-report-to-gerrit.sh
+++ b/jjb/ci_gate_security/anteater-report-to-gerrit.sh
@@ -12,14 +12,14 @@ if [[ -e securityaudit.log ]] ; then
if grep ERROR securityaudit.log; then
EXITSTATUS=1
fi
-
- cat securityaudit.log | awk -F"ERROR - " '{print $2}' > shortlog
-
+
+ cat securityaudit.log | awk -F"ERROR - " '{print $2}' | sed -e "s/\"/\\\\\"/g;s/\'/\\\\\'/g"> shortlog
+
ssh -p 29418 gerrit.opnfv.org \
"gerrit review -p $GERRIT_PROJECT \
-m \"$(cat shortlog)\" \
$GERRIT_PATCHSET_REVISION \
--notify NONE"
-
+
exit $EXITSTATUS
fi
diff --git a/jjb/ci_gate_security/anteater-security-audit.sh b/jjb/ci_gate_security/anteater-security-audit.sh
index 9bd3cc34f..35f9354e0 100644
--- a/jjb/ci_gate_security/anteater-security-audit.sh
+++ b/jjb/ci_gate_security/anteater-security-audit.sh
@@ -1,5 +1,7 @@
#!/bin/bash
cd $WORKSPACE
+REPORTDIR='.reports'
+mkdir -p $REPORTDIR
echo "Generating patchset file to list changed files"
git diff HEAD^1 --name-only | sed "s#^#/home/opnfv/anteater/$PROJECT/#" > $WORKSPACE/patchset
echo "Changed files are"
@@ -7,7 +9,7 @@ echo "--------------------------------------------------------"
cat $WORKSPACE/patchset
echo "--------------------------------------------------------"
-vols="-v $WORKSPACE:/home/opnfv/anteater/$PROJECT"
+vols="-v $WORKSPACE:/home/opnfv/anteater/$PROJECT -v $WORKSPACE/$REPORTDIR:/home/opnfv/anteater/$REPORTDIR"
envs="-e PROJECT=$PROJECT"
echo "Pulling releng-anteater docker image"
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index d991573b0..55d629cb4 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -93,6 +93,10 @@
builders:
- anteater-security-audit
- report-security-audit-result-to-gerrit
+ publishers:
+ - archive-artifacts:
+ artifacts: ".reports/*"
+
########################
# builder macros
########################
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index f75cddefe..a078c8f59 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -170,5 +170,8 @@ sudo cp -r ${DOVETAIL_HOME}/results ./
# PRIMARY_GROUP=$(id -gn $CURRENT_USER)
# sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
+#remove useless workspace from yardstick to save disk space
+sudo rm -rf ./results/workspace
+
echo "Dovetail: done!"
diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 5021b7832..eb57deb7b 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -30,7 +30,8 @@ node_list=(\
'arm-pod1' 'arm-pod3' \
'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \
'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \
-'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4'\
+'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \
+'zte-pod2' \
'zte-virtual1')
diff --git a/utils/test/testapi/docker/prepare-env.sh b/utils/test/testapi/docker/prepare-env.sh
index 4f1be7d6a..b14bc2448 100755
--- a/utils/test/testapi/docker/prepare-env.sh
+++ b/utils/test/testapi/docker/prepare-env.sh
@@ -8,7 +8,6 @@ fi
if [ "$base_url" != "" ]; then
sudo crudini --set --existing $FILE api url $base_url/api/v1
- sudo crudini --set --existing $FILE swagger base_url $base_url
sudo crudini --set --existing $FILE ui url $base_url
sudo echo "{\"testapiApiUrl\": \"$base_url/api/v1\"}" > \
/usr/local/lib/python2.7/dist-packages/opnfv_testapi/static/testapi-ui/config.json
diff --git a/utils/test/testapi/etc/config.ini b/utils/test/testapi/etc/config.ini
index 435188df7..1ec899fcb 100644
--- a/utils/test/testapi/etc/config.ini
+++ b/utils/test/testapi/etc/config.ini
@@ -18,9 +18,6 @@ results_per_page = 20
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
-
[ui]
url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/cmd/server.py b/utils/test/testapi/opnfv_testapi/cmd/server.py
index a5ac5eb6b..50ac049a0 100644
--- a/utils/test/testapi/opnfv_testapi/cmd/server.py
+++ b/utils/test/testapi/opnfv_testapi/cmd/server.py
@@ -37,7 +37,7 @@ from opnfv_testapi.tornado_swagger import swagger
def make_app():
- swagger.docs(base_url=CONF.swagger_base_url,
+ swagger.docs(base_url=CONF.ui_url,
static_path=CONF.static_path)
return swagger.Application(
url_mappings.mappings,
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/noparam.ini b/utils/test/testapi/opnfv_testapi/tests/unit/common/noparam.ini
index fda2a09e9..be7f2b9f8 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/noparam.ini
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/noparam.ini
@@ -12,5 +12,5 @@ port = 8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/normal.ini b/utils/test/testapi/opnfv_testapi/tests/unit/common/normal.ini
index 77cc6c6ee..c81c6c56a 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/normal.ini
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/normal.ini
@@ -13,5 +13,5 @@ port = 8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/nosection.ini b/utils/test/testapi/opnfv_testapi/tests/unit/common/nosection.ini
index 9988fc0a4..a9ed49c5c 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/nosection.ini
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/nosection.ini
@@ -7,5 +7,5 @@ port = 8000
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/notboolean.ini b/utils/test/testapi/opnfv_testapi/tests/unit/common/notboolean.ini
index b3f327670..3a11f9dd3 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/notboolean.ini
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/notboolean.ini
@@ -13,5 +13,5 @@ port = 8000
debug = True
authenticate = notboolean
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/notint.ini b/utils/test/testapi/opnfv_testapi/tests/unit/common/notint.ini
index d1b752a34..8180719b8 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/notint.ini
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/notint.ini
@@ -13,5 +13,5 @@ port = notint
debug = True
authenticate = False
-[swagger]
-base_url = http://localhost:8000
+[ui]
+url = http://localhost:8000
diff --git a/utils/test/testapi/opnfv_testapi/tests/unit/common/test_config.py b/utils/test/testapi/opnfv_testapi/tests/unit/common/test_config.py
index cc8743ca8..8cfc513be 100644
--- a/utils/test/testapi/opnfv_testapi/tests/unit/common/test_config.py
+++ b/utils/test/testapi/opnfv_testapi/tests/unit/common/test_config.py
@@ -12,4 +12,4 @@ def test_config_normal(mocker, config_normal):
assert CONF.api_port == 8000
assert CONF.api_debug is True
assert CONF.api_authenticate is False
- assert CONF.swagger_base_url == 'http://localhost:8000'
+ assert CONF.ui_url == 'http://localhost:8000'