Skip to content

Commit

Permalink
Reorganize CI jobs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
davidcassany committed Feb 7, 2020
1 parent 6b2bb42 commit 7b1f1f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
21 changes: 7 additions & 14 deletions ci/jenkins/jobs.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/templates/conformance-template.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- job-template:
name: '{name}-conformance'
name: '{name}-{platform}-conformance'
project-type: pipeline
number-to-keep: 30
days-to-keep: 30
Expand Down

0 comments on commit 7b1f1f3

Please sign in to comment.