Merge pull request #952 from davidcassany/reorganize_jobs

Reorganize CI jobs
SUSE · Feb 19, 2020 · e1748a8 · e1748a8
2 parents 1334d68 + 7b1f1f3
commit e1748a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: caasp-jobs/caasp-v4
+    name: caasp-jobs/v4/pr
     repo-name: skuba
     repo-owner: SUSE
     repo-credentials: github-token
@@ -15,25 +15,18 @@
         - '{name}-jjb-validation'
 
 - project:
-      name: caasp-jobs/caasp-v4-openstack
+      name: caasp-jobs/v4/conformance
       repo-name: skuba
       repo-owner: SUSE
       repo-credentials: github-token
-      platform: openstack
-      jobs:
-          - '{name}-conformance'
-
-- project:
-      name: caasp-jobs/caasp-v4-vmware
-      repo-name: skuba
-      repo-owner: SUSE
-      repo-credentials: github-token
-      platform: vmware
+      platform:
+        - openstack
+        - vmware
       jobs:
-          - '{name}-conformance'
+          - '{name}-{platform}-conformance'
 
 - project:
-    name: caasp-jobs/e2e/caasp-v4
+    name: caasp-jobs/v4/e2e
     repo-name: skuba
     repo-owner: SUSE
     repo-credentials: github-token

diff --git a/ci/jenkins/templates/conformance-template.yaml b/ci/jenkins/templates/conformance-template.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{name}-conformance'
+    name: '{name}-{platform}-conformance'
     project-type: pipeline
     number-to-keep: 30
     days-to-keep: 30