diff options
author | Nigel Babu <nigelb@redhat.com> | 2018-06-20 15:27:19 +0530 |
---|---|---|
committer | Nigel Babu <nigelb@redhat.com> | 2018-06-20 15:27:19 +0530 |
commit | 72a2c63590d18658c6ac6d4186a7497ceb81c213 (patch) | |
tree | da8b656ff1dbfadfe7f2c12ff420d304c7877666 | |
parent | e04f8f9493235790b54d415de9fd5f7453edae66 (diff) |
Fix the rpm jobs to not be duplicates
Change-Id: Id948cd84cd58180dd3d0f4dcc3306dcc2b81a0cc
-rw-r--r-- | build-gluster-org/jobs/devrpms.yml (renamed from build-gluster-org/jobs/el7-devrpms.yml) | 7 | ||||
-rw-r--r-- | build-gluster-org/jobs/fedora-devrpms.yml | 59 | ||||
-rw-r--r-- | build-gluster-org/jobs/fedora-rpms.yml | 54 | ||||
-rw-r--r-- | build-gluster-org/jobs/rpm.yml (renamed from build-gluster-org/jobs/epel7-rpms.yml) | 9 |
4 files changed, 14 insertions, 115 deletions
diff --git a/build-gluster-org/jobs/el7-devrpms.yml b/build-gluster-org/jobs/devrpms.yml index 209f136..c91610c 100644 --- a/build-gluster-org/jobs/el7-devrpms.yml +++ b/build-gluster-org/jobs/devrpms.yml @@ -1,16 +1,21 @@ - project: name: 'devrpm' version: + - fedora: + build_flag: fedora-28-x86_64 + node_name: fedora - el6: build_flag: epel-6-x86_64 + node_name: rpm7 - el7: build_flag: epel-7-x86_64 + node_name: rpm7 jobs: - '{name}-{version}' - job-template: name: '{name}-{version}' - node: rpm7 + node: '{node_name}' description: Creates RPMs for developers and those who need to verify the patch project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/fedora-devrpms.yml b/build-gluster-org/jobs/fedora-devrpms.yml deleted file mode 100644 index e539675..0000000 --- a/build-gluster-org/jobs/fedora-devrpms.yml +++ /dev/null @@ -1,59 +0,0 @@ -- project: - name: 'devrpm-fedora' - fedora_version: - - fedora: - build_flag: fedora-28-x86_64 - jobs: - - '{name}-{fedora_version}' - -- job-template: - name: '{name}-{fedora_version}' - node: fedora - description: Creates RPMs for developers and those who need to verify the patch - project-type: freestyle - concurrent: true - - properties: - - discard-after-x: - x: 30 - - one-build-per-node - - scm: - - glusterfs - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: false - exclude-trivial-rebase: false - exclude-no-code-change: false - - draft-published-event - - comment-added-contains-event: - comment-contains-value: "recheck smoke" - server-name: review.gluster.org_for-smoke-jobs - projects: - - project-compare-type: 'PLAIN' - project-pattern: 'glusterfs' - branches: - - branch-compare-type: 'PLAIN' - branch-pattern: 'master' - - parameters: - - string: - default: refs/heads/master - description: 'For review 12345 and patch set 6, this will be refs/changes/45/12345/6. Default: Tip of master' - name: GERRIT_REFSPEC - - string: - default: master - description: 'Name of the branch you want to build from. We usually build from master' - name: GERRIT_BRANCH - - publishers: - - rpm - - builders: - - shell: !include-raw: ../scripts/glusterfs-devrpms.sh - - wrappers: - - timestamps diff --git a/build-gluster-org/jobs/fedora-rpms.yml b/build-gluster-org/jobs/fedora-rpms.yml deleted file mode 100644 index 9e265da..0000000 --- a/build-gluster-org/jobs/fedora-rpms.yml +++ /dev/null @@ -1,54 +0,0 @@ -- project: - name: 'rpm-fedora' - bversion: - - fedora: - build_flag: fedora-28-x86_64 - - rawhide: - build_flag: fedora-rawhide-x86_64 - jobs: - - '{name}-{bversion}' - -- job-template: - name: '{name}-{bversion}' - node: fedora - description: Creates RPMs for developers and those who need to verify the patch - project-type: freestyle - concurrent: true - - properties: - - discard-after-x: - x: 30 - - one-build-per-node - - scm: - - glusterfs - - triggers: - - gerrit: - trigger-on: - - change-merged-event - projects: - - project-compare-type: 'PLAIN' - project-pattern: 'glusterfs' - branches: - - branch-compare-type: 'PLAIN' - branch-pattern: 'master' - - parameters: - - string: - default: refs/heads/master - description: 'For review 12345 and patch set 6, this will be refs/changes/45/12345/6. Default: Tip of master' - name: GERRIT_REFSPEC - - string: - default: master - description: 'Name of the branch you want to build from. We usually build from master' - name: GERRIT_BRANCH - - publishers: - - rpm - - builders: - - shell: !include-raw: ../scripts/glusterfs-rpms.sh - - wrappers: - - timestamps diff --git a/build-gluster-org/jobs/epel7-rpms.yml b/build-gluster-org/jobs/rpm.yml index 426f46f..5292771 100644 --- a/build-gluster-org/jobs/epel7-rpms.yml +++ b/build-gluster-org/jobs/rpm.yml @@ -3,12 +3,19 @@ buildversion: - el7: build_flag: epel-7-x86_64 + node_name: rpm7 + - fedora: + build_flag: fedora-28-x86_64 + node_name: fedora + - rawhide: + build_flag: fedora-rawhide-x86_64 + node_name: fedora jobs: - '{name}-{buildversion}' - job-template: name: '{name}-{buildversion}' - node: rpm7 + node: '{node_name}' description: Creates RPMs for developers and those who need to verify the patch project-type: freestyle concurrent: true |