jjb: move project-style to releng-defaults.yaml

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 47024e2..5f103b1 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -57,8 +57,6 @@
 - job-template:
     name: set-functest-env-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -70,13 +68,9 @@
     builders:
         - 'set-functest-env'
 
-
-
 - job-template:
     name: clean-functest-env-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -88,12 +82,9 @@
     builders:
         - 'functest-cleanup'
 
-
 - job-template:
     name: set-functest-env-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     logrotate:
@@ -105,12 +96,9 @@
     builders:
         - 'set-functest-env'
 
-
 - job-template:
     name: clean-functest-env-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     logrotate:
@@ -125,8 +113,6 @@
 - job-template:
     name: functest-openstack-bench-test-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -138,12 +124,9 @@
     builders:
         - 'functest-rally-bench'
 
-
 - job-template:
     name: functest-openstack-tempest-smoke-test-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -158,8 +141,6 @@
 - job-template:
     name: functest-odl-test-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -172,12 +153,9 @@
         - shell: |
         - 'functest-odl'
 
-
 - job-template:
     name: functest-vping-test-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     logrotate:
@@ -189,12 +167,9 @@
     builders:
         - 'functest-vping'
 
-
 - job-template:
     name: functest-{pod}
 
-    project-type: freestyle
-
     node: '{pod}'
 
     parameters:
@@ -232,8 +207,6 @@
 - job-template:
     name: functest-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     parameters:
@@ -274,8 +247,6 @@
 - job-template:
     name: functest-vims-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     parameters:
@@ -321,7 +292,6 @@
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    project-type: freestyle
     varsetabove: '{somevar}'
 
     logrotate:
@@ -360,8 +330,6 @@
 
     node: master
 
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -411,8 +379,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -515,7 +481,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
 - builder:
     name: set-functest-env
     builders:
@@ -552,7 +517,6 @@
             echo "Executing command inside the docker: ${cmd}"
             docker exec ${container_id} ${cmd}
 
-
 - builder:
     name: functest-vping
     builders:
@@ -590,8 +554,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
-
 - builder:
     name: functest-rally-bench
     builders:
@@ -604,7 +566,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
 - builder:
     name: functest-vims
     builders:
@@ -617,8 +578,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
-
 - builder:
     name: functest-store-results
     builders:
@@ -640,7 +599,6 @@
                 docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm
             fi
 
-
             # Remove existing images if exist
             if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
                 echo "Docker images to remove:"