From 6fe95bf04479986a9b76468db706ca51faf2ec2c Mon Sep 17 00:00:00 2001 From: afenner Date: Wed, 31 Jul 2019 16:39:11 +0100 Subject: [PATCH] changing dcaegen2-collectors to not overlap with dcaegen2-collectors-datafile Change-Id: I8556d0491423d69a3a78e8bf4454147f1c6a6e06 Signed-off-by: afenner --- ...egen2-collectors-datafile-rebase-jobs.yaml | 21 ---------- ...egen2-collectors-datafile-verify-jobs.yaml | 23 ----------- ...aegen2-collectors-push-upstream-jobs.yaml} | 6 +-- .../dcaegen2-collectors-rebase-jobs.yaml | 38 ++++++++++++++++++ .../dcaegen2-collectors-verify-jobs.yaml | 40 +++++++++++++++++++ 5 files changed, 81 insertions(+), 47 deletions(-) delete mode 100644 jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml delete mode 100644 jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml rename jjb/onap/dcaegen2-collectors/{dcaegen2-collectors-datafile-push-upstream-jobs.yaml => dcaegen2-collectors-push-upstream-jobs.yaml} (88%) create mode 100644 jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml create mode 100644 jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml deleted file mode 100644 index d2c32c2f8..000000000 --- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-rebase-jobs.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# this job gets triggered when a change is merged to -# dcaegen2/collectors/datafile project on ONAP Gerrit. -- project: - - name: datafile-rebase - - project: dcaegen2/collectors/datafile - - project-name: dcaegen2-collectors-datafile - - stream: - - master: - branch: '{stream}' - - casablanca: - branch: '{stream}' - - dublin: - branch: '{stream}' - - jobs: - - 'onap-{project-name}-{stream}-rebase' diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml deleted file mode 100644 index 8cd726672..000000000 --- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-verify-jobs.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# this job gets triggered when a change is proposed to -# dcaegen2/collectors/datafile project on Nordix Gerrit. -- project: - - name: datafile-verify - - project: dcaegen2/collectors/datafile - - project-name: dcaegen2-collectors-datafile - - stream: - - nordix-dev: - branch: '{stream}' - - master: - branch: '{stream}' - - casablanca: - branch: '{stream}' - - dublin: - branch: '{stream}' - - jobs: - - 'onap-{project-name}-{stream}-verify-java' diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml similarity index 88% rename from jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml rename to jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml index eff3bcd94..a76ac9987 100644 --- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-datafile-push-upstream-jobs.yaml +++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-push-upstream-jobs.yaml @@ -19,9 +19,9 @@ # # this job gets triggered when push-upstream is commented on a change on Nordix Gerrit. - project: - name: dcaegen2-collectors-datafile-push-upstream - project: dcaegen2/collectors/datafile - project-name: dcaegen2-collectors-datafile + name: dcaegen2-collectors-push-upstream + project: dcaegen2/collectors + project-name: dcaegen2-collectors stream: - master: branch: '{stream}' diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml new file mode 100644 index 000000000..e00bb3f09 --- /dev/null +++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-rebase-jobs.yaml @@ -0,0 +1,38 @@ +--- +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +# this job gets triggered when a change is merged to +# dcaegen2/collectors/datafile project on ONAP Gerrit. +- project: + + name: dcaegen2-collectors-rebase + + project: dcaegen2/collectors + + project-name: dcaegen2-collectors + + stream: + - master: + branch: '{stream}' + - casablanca: + branch: '{stream}' + - dublin: + branch: '{stream}' + + jobs: + - 'onap-{project-name}-{stream}-rebase' diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml new file mode 100644 index 000000000..0f222c3ec --- /dev/null +++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml @@ -0,0 +1,40 @@ +--- +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Nordix Foundation. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +# this job gets triggered when a change is proposed to +# dcaegen2/collectors project on Nordix Gerrit. +- project: + + name: dcaegen2-collectors-verify + + project: dcaegen2/collectors + + project-name: dcaegen2-collectors + + stream: + - nordix-dev: + branch: '{stream}' + - master: + branch: '{stream}' + - casablanca: + branch: '{stream}' + - dublin: + branch: '{stream}' + + jobs: + - 'onap-{project-name}-{stream}-verify-java' -- 2.25.1