Merge "Remove opnfv/functest-restapi"

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

diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml
index bfeae5e..50c7c38 100644 (file)
--- a/jjb/functest/functest-docker.yml
+++ b/jjb/functest/functest-docker.yml
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -31,7 +31,6 @@
       - 'parser'
       - 'smoke'
       - 'vnf'
-      - 'restapi'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -72,7 +71,7 @@
     disabled: '{obj:disabled}'
 
     parameters:
-      - job-parameters:
+      - functest-job-parameters:
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
@@ -136,10 +135,6 @@
               <<: *build-job-settings
             - name: 'functest-vnf-docker-build-arm64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-restapi-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-restapi-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -157,8 +152,6 @@
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-restapi-docker-manifest-{stream}'
-              <<: *manifest-job-settings
 
     publishers:
       - 'functest-amd64-recipients'
@@ -168,7 +161,7 @@
     name: 'functest-{image}-docker-build-{arch_tag}-{stream}'
     disabled: '{obj:disabled}'
     parameters:
-      - job-parameters:
+      - functest-job-parameters:
           project: '{project}'
           branch: '{branch}'
           slave_label: '{slave_label}'
@@ -230,7 +223,7 @@
 
 # parameter macro
 - parameter:
-    name: job-parameters
+    name: functest-job-parameters
     parameters:
       - project-parameter:
           project: '{project}'
@@ -290,3 +283,4 @@
             jalausuch@suse.com morgan.richomme@orange.com
             cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
             juha.kosonen@nokia.com wangwulin@huawei.com
+            valentin.boucher@kontron.com