Merge "security scan: Add example job for scanning python files"

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 0948353..3dd4c0b 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -19,11 +19,11 @@
         - 'create-apex-vms':
             slave-label: 'ericsson-virtual5'
         - 'install-netvirt':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
         - 'functest':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
         - 'postprocess':
-            slave-label: 'ericsson-virtual6'
+            slave-label: 'odl-netvirt-virtual'
 #####################################
 # jobs
 #####################################
@@ -57,7 +57,7 @@
         - string:
             name: NETVIRT_ARTIFACT
             default: $WORKSPACE/distribution-karaf.tar.gz
-        - 'ericsson-virtual6-defaults'
+        - 'odl-netvirt-virtual-defaults'
 
     triggers:
         - gerrit:
@@ -119,22 +119,16 @@
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'odl-netvirt-verify-virtual-functest-{stream}'
-                  current-parameters: false
+                - name: 'functest-netvirt-virtual-suite-{stream}'
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
-                    GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
-                    GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
-                    NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+                    FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
+                    RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
                   node-parameters: true
                   kill-phase-on: FAILURE
-                  abort-all-job: true
+                  abort-all-job: false
         - multijob:
             name: postprocess
-            condition: SUCCESSFUL
+            condition: ALWAYS
             projects:
                 - name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
                   current-parameters: false

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index a41a989..4082c34 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -66,7 +66,7 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then
     exit 1
 fi
 
-exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE}"
+exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE} -d true"
 echo "Container exec command: ${exec_cmd}"
 docker exec ${container_id} ${exec_cmd}
 

diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index df28656..a30fb59 100755 (executable)
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -8,7 +8,7 @@ if [[ ${branch} == *"brahmaputra"* ]]; then
 elif [[ ${branch} == *"colorado"* ]]; then
     cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
 else
-    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+    cmd="functest testcase run $FUNCTEST_SUITE_NAME"
 fi
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
 docker exec $container_id $cmd

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index a8dae73..2526111 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -681,19 +681,15 @@
             default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ericsson-virtual6-defaults'
+    name: 'odl-netvirt-virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'ericsson-virtual6'
+            default: 'odl-netvirt-virtual'
         - string:
             name: GIT_BASE
             default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: APEX_ENV_NUMBER
-            default: '"0"'
-            description: 'The number of the Apex environment on the machine'
 #####################################################
 # These slaves are just dummy slaves for sandbox jobs
 #####################################################

diff --git a/utils/test/testapi/deployment/deploy.py b/utils/test/testapi/deployment/deploy.py
new file mode 100644 (file)
index 0000000..748bd34
--- /dev/null
+++ b/utils/test/testapi/deployment/deploy.py
@@ -0,0 +1,40 @@
+import argparse
+import os
+
+from jinja2 import Environment, FileSystemLoader
+
+env = Environment(loader=FileSystemLoader('./'))
+docker_compose_yml = './docker-compose.yml'
+docker_compose_template = './docker-compose.yml.template'
+
+
+def render_docker_compose(port, swagger_url):
+    vars = {
+        "expose_port": port,
+        "swagger_url": swagger_url,
+    }
+    template = env.get_template(docker_compose_template)
+    yml = template.render(vars=vars)
+
+    with open(docker_compose_yml, 'w') as f:
+        f.write(yml)
+        f.close()
+
+
+def main(args):
+    render_docker_compose(args.expose_port, args.swagger_url)
+    os.system('docker-compose -f {} up -d'.format(docker_compose_yml))
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Backup MongoDBs')
+    parser.add_argument('-p', '--expose-port',
+                        type=int,
+                        required=False,
+                        default=8000,
+                        help='testapi exposed port')
+    parser.add_argument('-su', '--swagger-url',
+                        type=str,
+                        required=True,
+                        help='testapi exposed swagger-url')
+    main(parser.parse_args())

diff --git a/utils/test/testapi/deployment/docker-compose.yml.template b/utils/test/testapi/deployment/docker-compose.yml.template
new file mode 100644 (file)
index 0000000..5b131f7
--- /dev/null
+++ b/utils/test/testapi/deployment/docker-compose.yml.template
@@ -0,0 +1,15 @@
+version: '2'
+services:
+  mongo:
+    image: mongo:3.2.1
+    container_name: opnfv-mongo
+  testapi:
+    image: opnfv/testapi:latest
+    container_name: opnfv-testapi
+    environment:
+      - mongodb_url=mongodb://mongo:27017/
+      - swagger_url={{ vars.swagger_url }}
+    ports:
+      - "{{ vars.expose_port }}:8000"
+    links:
+      - mongo