Merge "Revert "Fix for generating log.html in Netvirt""

[releng/builder.git] / jjb / faas / faas.yaml

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index f9e4ddfd2d65e4b89aea2c189198ff8593dd8694..98c80bc87357e9155c311d2aa8dd63e0a42054be 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -2,17 +2,15 @@
 - project:
     name: faas-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,6 +78,9 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-sonar
     jobs: