From 2804ff97300e205d7d0c1f537d9d273c88abb578 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 29 Jan 2019 10:43:13 +0100 Subject: [PATCH 01/16] Add global macro for build-timeout Change-Id: Ieb80cfe49ce5e24d92c7240b7db60496d5131e24 --- jjb/global/jjb-macros.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index 3de22ee0..cedcea1b 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -206,3 +206,12 @@ credential-id: nordixinfra-jjb-creds username: JJB_USERNAME password: JJB_USERTOKEN + +# timeout wrapper to use for jobs +- wrapper: + name: build-timeout + wrappers: + - timeout: + timeout: '{timeout}' + timeout-var: 'BUILD_TIMEOUT' + fail: true -- 2.25.1 From 42a5482efc98e204faf5ead7bf2cfad6da1e6041 Mon Sep 17 00:00:00 2001 From: egernug Date: Wed, 30 Jan 2019 13:03:42 +0000 Subject: [PATCH 02/16] Add push upstream jobs for dcaegen2/collectors/datafile Change-Id: I3bdf9f06d266fe592ab544ad01adb361b92d020b --- ...ollectors-datafile-push-upstream-jobs.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml new file mode 100644 index 00000000..3e17bb67 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml @@ -0,0 +1,30 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: dcaegen2-collectors-datafile-push-upstream + project: dcaegen2/collectors/datafile + project-name: ddcaegen2-collectors-datafile + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' -- 2.25.1 From 20c5a591c40871ef9ae81e9289104145a042677f Mon Sep 17 00:00:00 2001 From: dfarrelly Date: Thu, 31 Jan 2019 09:25:27 +0000 Subject: [PATCH 03/16] Add rebase, push jobs for dcaegen2/platform/blueprints Change-Id: I046d6e3666bf22629eb8e50b5e3a61eec9e82fbe --- ...latform-blueprints-push-upstream-jobs.yaml | 30 +++++++++++++++ ...egen2-platform-blueprints-rebase-jobs.yaml | 37 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml create mode 100644 jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml new file mode 100644 index 00000000..65d4a6bd --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml @@ -0,0 +1,30 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: dcaegen2-platform-blueprints-push-upstream + project: dcaegen2/platform/blueprints + project-name: dcaegen2-platform-blueprints + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml new file mode 100644 index 00000000..7006280f --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml @@ -0,0 +1,37 @@ +--- +# ============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/platform/blueprints project on ONAP Gerrit. +- project: + + name: dcaegen2-platform-blueprints-rebase + + project: dcaegen2/platform/blueprints + + project-name: dcaegen2/platform/blueprints + + stream: + - master: + branch: '{stream}' + - casablanca: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-rebase' -- 2.25.1 From e2e3ff76a147f1e2f31d4ee0a418afcf3b6ab4d6 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 29 Jan 2019 10:37:39 +0100 Subject: [PATCH 04/16] Enable 10 minutes build-timeout for push-upstream jobs Change-Id: Id905205f1b95705230ac8c88da11a54e317ee05b --- jjb/global/global-templates-push-upstream.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml index cde2a836..7b5612e9 100644 --- a/jjb/global/global-templates-push-upstream.yaml +++ b/jjb/global/global-templates-push-upstream.yaml @@ -25,6 +25,10 @@ branch: '{branch}' files: '**' + wrappers: + - build-timeout: + timeout: 10 + builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh -- 2.25.1 From 89d984623331acfb1bf30166c2c11530ffeea3ce Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 29 Jan 2019 10:34:20 +0100 Subject: [PATCH 05/16] Enable 45 minutes build-timeout for java verify jobs Change-Id: Ia1748e030e97d5bb663f6d1e945e2714cd5a9a77 --- jjb/global/global-templates-java.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml index 639168bc..0933bc0c 100644 --- a/jjb/global/global-templates-java.yaml +++ b/jjb/global/global-templates-java.yaml @@ -41,6 +41,10 @@ branch: '{branch}' files: '**' + wrappers: + - build-timeout: + timeout: 45 + builders: - shell: !include-raw-escape: ./verify-jobs.sh -- 2.25.1 From 891d409e74a5b7ac01a103a0469347b8a7f29c72 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 29 Jan 2019 10:36:33 +0100 Subject: [PATCH 06/16] Enable 10 minutes build-timeout for rebase jobs Change-Id: I1bb999558e406f6483879bc25a3b6078f8a94892 --- jjb/global/global-templates-rebase.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml index 843175e6..38712ae2 100644 --- a/jjb/global/global-templates-rebase.yaml +++ b/jjb/global/global-templates-rebase.yaml @@ -29,6 +29,10 @@ branch: '{branch}' files: '**' + wrappers: + - build-timeout: + timeout: 10 + builders: - shell: !include-raw-escape: ./rebase-jobs.sh -- 2.25.1 From 20a93ff6e1df47721ce3530aed97ac54836dc553 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 31 Jan 2019 14:17:43 +0100 Subject: [PATCH 07/16] Fix typo in dcaegen2/collectors/datafile project name Change-Id: I9956a23737e59cf7503915cb8741fa5103e4e81c --- .../dcaegen2-collectors-datafile-push-upstream-jobs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml index 3e17bb67..a844d30b 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-push-upstream-jobs.yaml @@ -21,7 +21,7 @@ - project: name: dcaegen2-collectors-datafile-push-upstream project: dcaegen2/collectors/datafile - project-name: ddcaegen2-collectors-datafile + project-name: dcaegen2-collectors-datafile stream: - master: branch: '{stream}' -- 2.25.1 From 7df13e2b26884b9a7c72d7a0c83bacbb55427a38 Mon Sep 17 00:00:00 2001 From: dfarrelly Date: Thu, 31 Jan 2019 13:24:51 +0000 Subject: [PATCH 08/16] Replaced slashes with dashes in project name Change-Id: Ie418732bfd0706b6a80ac906397a334d23de4ece --- jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml index 7006280f..d054ebb9 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml @@ -25,7 +25,7 @@ project: dcaegen2/platform/blueprints - project-name: dcaegen2/platform/blueprints + project-name: dcaegen2-platform-blueprints stream: - master: -- 2.25.1 From 243f424c180c1d57510fb1cd8d187ea6d4f062c0 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 31 Jan 2019 18:48:58 +0100 Subject: [PATCH 09/16] Add global jjb macro for slack notifications Change-Id: Ia8084335c0eaed8cd0bcb679ce6b6c38d9350634 --- jjb/global/jjb-macros.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index cedcea1b..a14b0577 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -215,3 +215,11 @@ timeout: '{timeout}' timeout-var: 'BUILD_TIMEOUT' fail: true + +- publisher: + name: notify-slack + publishers: + - slack: + room: '{slack-channel}' + notify-failure: True + notify-back-to-normal: True -- 2.25.1 From 7f40f740ca504565fdef1e7f050be5bb4ad70fc5 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 31 Jan 2019 18:49:17 +0100 Subject: [PATCH 10/16] Enable slack notifications for push and rebase jobs Change-Id: Ib20225ffff100b330819c24dc40a4176f917e819 --- jjb/global/global-templates-push-upstream.yaml | 4 ++++ jjb/global/global-templates-rebase.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml index 7b5612e9..322efa43 100644 --- a/jjb/global/global-templates-push-upstream.yaml +++ b/jjb/global/global-templates-push-upstream.yaml @@ -32,3 +32,7 @@ builders: - shell: !include-raw-escape: ./push-upstream-jobs.sh + + publishers: + - notify-slack: + slack-channel: '#infra' diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml index 38712ae2..d740404f 100644 --- a/jjb/global/global-templates-rebase.yaml +++ b/jjb/global/global-templates-rebase.yaml @@ -36,3 +36,7 @@ builders: - shell: !include-raw-escape: ./rebase-jobs.sh + + publishers: + - notify-slack: + slack-channel: '#infra' -- 2.25.1 From 7786a401870c903e6525995df902b6e15409830a Mon Sep 17 00:00:00 2001 From: Liam Fallon Date: Tue, 5 Feb 2019 13:01:46 +0000 Subject: [PATCH 11/16] Add rebase/verify/push jobs for policy/models Change-Id: I846f98f420fda54ce059efc7ca128b4f50e3a939 --- .../policy-models-push-upstream-jobs.yaml | 31 ++++++++++++++++ jjb/policy/policy-models-rebase-jobs.yaml | 35 ++++++++++++++++++ jjb/policy/policy-models-verify-jobs.yaml | 36 +++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 jjb/policy/policy-models-push-upstream-jobs.yaml create mode 100644 jjb/policy/policy-models-rebase-jobs.yaml create mode 100644 jjb/policy/policy-models-verify-jobs.yaml diff --git a/jjb/policy/policy-models-push-upstream-jobs.yaml b/jjb/policy/policy-models-push-upstream-jobs.yaml new file mode 100644 index 00000000..6a23aed3 --- /dev/null +++ b/jjb/policy/policy-models-push-upstream-jobs.yaml @@ -0,0 +1,31 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: policy-models-push-upstream + project: policy/models + project-name: policy-models + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/policy/policy-models-rebase-jobs.yaml b/jjb/policy/policy-models-rebase-jobs.yaml new file mode 100644 index 00000000..0a78f812 --- /dev/null +++ b/jjb/policy/policy-models-rebase-jobs.yaml @@ -0,0 +1,35 @@ +--- +# ============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 +# policy/models project on ONAP Gerrit. +- project: + name: policy-models-rebase + project: policy/models + project-name: policy-models + + stream: + - master: + branch: '{stream}' +# - casablanca: +# branch: '{stream}' + + jobs: + - '{project-name}-{stream}-rebase' diff --git a/jjb/policy/policy-models-verify-jobs.yaml b/jjb/policy/policy-models-verify-jobs.yaml new file mode 100644 index 00000000..08f8bdd5 --- /dev/null +++ b/jjb/policy/policy-models-verify-jobs.yaml @@ -0,0 +1,36 @@ +--- +# +# ============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 +# policy/models project on Nordix Gerrit. + +- project: + name: policy-models-verify + project: policy/models + project-name: policy-models + + stream: + - 'master': + branch: '{stream}' + - 'casablanca': + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-verify-java' -- 2.25.1 From 15cfb1e32b190633b56b3e88ae80883139749d24 Mon Sep 17 00:00:00 2001 From: Liam Fallon Date: Tue, 5 Feb 2019 13:10:06 +0000 Subject: [PATCH 12/16] Add rebase/verify/push jobs for policy/drools-applications Change-Id: I8ff804826a49f3ce05cdef5bd007851380870253 --- ...rools-applications-push-upstream-jobs.yaml | 31 ++++++++++++++++ ...olicy-drools-applications-rebase-jobs.yaml | 35 ++++++++++++++++++ ...olicy-drools-applications-verify-jobs.yaml | 36 +++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 jjb/policy/policy-drools-applications-push-upstream-jobs.yaml create mode 100644 jjb/policy/policy-drools-applications-rebase-jobs.yaml create mode 100644 jjb/policy/policy-drools-applications-verify-jobs.yaml diff --git a/jjb/policy/policy-drools-applications-push-upstream-jobs.yaml b/jjb/policy/policy-drools-applications-push-upstream-jobs.yaml new file mode 100644 index 00000000..b10c0e55 --- /dev/null +++ b/jjb/policy/policy-drools-applications-push-upstream-jobs.yaml @@ -0,0 +1,31 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: policy-drools-applications-push-upstream + project: policy/drools-applications + project-name: policy-drools-applications + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/policy/policy-drools-applications-rebase-jobs.yaml b/jjb/policy/policy-drools-applications-rebase-jobs.yaml new file mode 100644 index 00000000..c29ae60c --- /dev/null +++ b/jjb/policy/policy-drools-applications-rebase-jobs.yaml @@ -0,0 +1,35 @@ +--- +# ============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 +# policy/drools-applications project on ONAP Gerrit. +- project: + name: policy-drools-applications-rebase + project: policy/drools-applications + project-name: policy-drools-applications + + stream: + - master: + branch: '{stream}' +# - casablanca: +# branch: '{stream}' + + jobs: + - '{project-name}-{stream}-rebase' diff --git a/jjb/policy/policy-drools-applications-verify-jobs.yaml b/jjb/policy/policy-drools-applications-verify-jobs.yaml new file mode 100644 index 00000000..0e370232 --- /dev/null +++ b/jjb/policy/policy-drools-applications-verify-jobs.yaml @@ -0,0 +1,36 @@ +--- +# +# ============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 +# policy/drools-applications project on Nordix Gerrit. + +- project: + name: policy-drools-applications-verify + project: policy/drools-applications + project-name: policy-drools-applications + + stream: + - 'master': + branch: '{stream}' + - 'casablanca': + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-verify-java' -- 2.25.1 From 504e704c5e8b35b21acec6f83b5ee85fecb2e641 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 5 Feb 2019 15:23:46 +0100 Subject: [PATCH 13/16] Add rebase/push jobs for testsuite Change-Id: I7d71eaad47d55de320c3b37b57c33c7cc7f4a674 --- .../testsuite-push-upstream-jobs.yaml | 31 +++++++++++++++++ jjb/testsuite/testsuite-rebase-jobs.yaml | 33 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 jjb/testsuite/testsuite-push-upstream-jobs.yaml create mode 100644 jjb/testsuite/testsuite-rebase-jobs.yaml diff --git a/jjb/testsuite/testsuite-push-upstream-jobs.yaml b/jjb/testsuite/testsuite-push-upstream-jobs.yaml new file mode 100644 index 00000000..2bc810ec --- /dev/null +++ b/jjb/testsuite/testsuite-push-upstream-jobs.yaml @@ -0,0 +1,31 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: testsuite-push-upstream + project: testsuite + project-name: testsuite + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/testsuite/testsuite-rebase-jobs.yaml b/jjb/testsuite/testsuite-rebase-jobs.yaml new file mode 100644 index 00000000..16a1aa2a --- /dev/null +++ b/jjb/testsuite/testsuite-rebase-jobs.yaml @@ -0,0 +1,33 @@ +--- +# ============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 +# testsuite project on ONAP Gerrit. +- project: + name: testsuite-rebase + project: testsuite + project-name: testsuite + + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-rebase' -- 2.25.1 From 271a1129b539db23607ff13aa2960a638eab5483 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 6 Feb 2019 10:55:11 +0100 Subject: [PATCH 14/16] Add rebase/push jobs for sdc Change-Id: Idb8e7eb8aa0284386818221d036a9c4a3ff1dc81 --- jjb/sdc/sdc-push-upstream-jobs.yaml | 31 +++++++++++++++++++++++++++ jjb/sdc/sdc-rebase-jobs.yaml | 33 +++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 jjb/sdc/sdc-push-upstream-jobs.yaml create mode 100644 jjb/sdc/sdc-rebase-jobs.yaml diff --git a/jjb/sdc/sdc-push-upstream-jobs.yaml b/jjb/sdc/sdc-push-upstream-jobs.yaml new file mode 100644 index 00000000..c73d64f6 --- /dev/null +++ b/jjb/sdc/sdc-push-upstream-jobs.yaml @@ -0,0 +1,31 @@ +--- +# ============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 push-upstream is commented on a change on Nordix Gerrit. +- project: + name: sdc-push-upstream + project: sdc + project-name: sdc + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/sdc/sdc-rebase-jobs.yaml b/jjb/sdc/sdc-rebase-jobs.yaml new file mode 100644 index 00000000..a1874415 --- /dev/null +++ b/jjb/sdc/sdc-rebase-jobs.yaml @@ -0,0 +1,33 @@ +--- +# ============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 +# sdc project on ONAP Gerrit. +- project: + name: sdc-rebase + project: sdc + project-name: sdc + + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-rebase' -- 2.25.1 From 9c3cf2beef1aee1421672fec40a79c8e5cb52931 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 6 Feb 2019 22:43:46 +0100 Subject: [PATCH 15/16] Create dfc verify job for nordix-dev Change-Id: Ib01b6b9a31dbf20fb9a3dd82451b2e20a81d067c --- jjb/dcaegen2/dcaegen2-collectors-datafile-verify-jobs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-verify-jobs.yaml index a207a956..5317f02f 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile-verify-jobs.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-verify-jobs.yaml @@ -10,6 +10,8 @@ project-name: dcaegen2-collectors-datafile stream: + - nordix-dev: + branch: '{stream}' - master: branch: '{stream}' - casablanca: -- 2.25.1 From fbd236fbccb10455690fb671c24fb537493d9b1f Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 7 Feb 2019 10:08:35 +0100 Subject: [PATCH 16/16] Discard old builds Change-Id: I066ef3c714ec59390f1ea2b84a5daf3ce6af831b --- jjb/global/global-templates-java.yaml | 3 +++ jjb/global/global-templates-push-upstream.yaml | 3 +++ jjb/global/global-templates-rebase.yaml | 3 +++ jjb/global/jjb-macros.yaml | 10 ++++++++++ 4 files changed, 19 insertions(+) diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml index 0933bc0c..53eab051 100644 --- a/jjb/global/global-templates-java.yaml +++ b/jjb/global/global-templates-java.yaml @@ -7,6 +7,9 @@ concurrent: true + properties: + - logrotate + parameters: - project-parameters: project: '{project}' diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml index 322efa43..032a7174 100644 --- a/jjb/global/global-templates-push-upstream.yaml +++ b/jjb/global/global-templates-push-upstream.yaml @@ -7,6 +7,9 @@ concurrent: true + properties: + - logrotate + parameters: - project-parameters: project: '{project}' diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml index d740404f..a76dfaaf 100644 --- a/jjb/global/global-templates-rebase.yaml +++ b/jjb/global/global-templates-rebase.yaml @@ -7,6 +7,9 @@ concurrent: false + properties: + - logrotate + parameters: - project-parameters: project: '{project}' diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index a14b0577..9630a917 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -223,3 +223,13 @@ room: '{slack-channel}' notify-failure: True notify-back-to-normal: True + +# property to discard old builds +- property: + name: logrotate + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 100 + artifact-days-to-keep: 30 + artifact-num-to-keep: 100 -- 2.25.1