From 7b1f1f343df1606b4ee4c40b3c2c63877eed7bde Mon Sep 17 00:00:00 2001 From: David Cassany Date: Fri, 7 Feb 2020 13:43:20 +0100 Subject: [PATCH] Reorganize CI jobs This commit reorganized CI jobs to be structuredas follows: * caasp-jobs/v4/pr: pull requests jobs * caasp-jobs/v4/e2e: e2e and update tests for all platforms * caasp-jobs/v4/conformance: conformance tests for all platforms --- ci/jenkins/jobs.yaml | 21 +++++++------------ .../templates/conformance-template.yaml | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml index 46e445c970..58ec868c10 100644 --- 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 index d3f204343b..c9c441dc20 100644 --- 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