From 1e7b337036566297daf0f899a6bf4d6631491f3a Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 14 Mar 2019 15:11:15 -0700 Subject: [PATCH] Add Acumos Gerrit configuration and rebase jobs Please note that this is a quick fix to get Acumos work started. We need to group projects/jobs under upstream project name to prevent name clashes and this is a significant change, requiring more time to fix. Change-Id: I77327ef1948ae28ff19b8813fcbfe5e90b928f4d --- .../global-templates-acumos-rebase.yaml | 46 +++++++++++++++++++ .../portal-marketplace-rebase-jobs.yml | 28 +++++++++++ .../security-verification-rebase-jobs.yaml | 28 +++++++++++ .../system-integration-rebase-jobs.yml | 28 +++++++++++ jjb/global/jjb-macros.yaml | 39 ++++++++++++++++ 5 files changed, 169 insertions(+) create mode 100644 jjb/acumos/global-templates-acumos-rebase.yaml create mode 100644 jjb/acumos/portal-marketplace/portal-marketplace-rebase-jobs.yml create mode 100644 jjb/acumos/security-verification/security-verification-rebase-jobs.yaml create mode 100644 jjb/acumos/system-integration/system-integration-rebase-jobs.yml diff --git a/jjb/acumos/global-templates-acumos-rebase.yaml b/jjb/acumos/global-templates-acumos-rebase.yaml new file mode 100644 index 000000000..e26e872ea --- /dev/null +++ b/jjb/acumos/global-templates-acumos-rebase.yaml @@ -0,0 +1,46 @@ +- job-template: + name: 'acumos-{project-name}-{stream}-rebase' + + node: infra-build01-ubuntu1804 + + disabled: false + + concurrent: false + + properties: + - logrotate + + parameters: + - project-parameters: + project: '{project}' + branch: '{branch}' + - acumos-gerrit-parameters + - string: + name: NORDIX_REMOTE + default: 'ssh://infra@gerrit.nordix.org:29418/acumos/{project}.git' + description: The remote to add for Nordix. + + scm: + - git-scm: + ssh-credentials-id: nordixinfra-lfn-gerrit-ssh + branch: '{branch}' + refspec: '' + + triggers: + - acumos-gerrit-trigger-change-merged: + project: '{project}' + branch: '{branch}' + files: '**' + - timed: "@midnight" + + wrappers: + - build-timeout: + timeout: 10 + + builders: + - shell: + !include-raw-escape: ../global/rebase-jobs.sh + + publishers: + - notify-slack: + slack-channel: '#acumos' diff --git a/jjb/acumos/portal-marketplace/portal-marketplace-rebase-jobs.yml b/jjb/acumos/portal-marketplace/portal-marketplace-rebase-jobs.yml new file mode 100644 index 000000000..00fffea9e --- /dev/null +++ b/jjb/acumos/portal-marketplace/portal-marketplace-rebase-jobs.yml @@ -0,0 +1,28 @@ +--- +# ============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========================================================= +# +- project: + name: portal-marketplace-rebase + project: portal-marketplace + project-name: portal-marketplace + stream: + - master: + branch: '{stream}' + jobs: + - 'acumos-{project-name}-{stream}-rebase' diff --git a/jjb/acumos/security-verification/security-verification-rebase-jobs.yaml b/jjb/acumos/security-verification/security-verification-rebase-jobs.yaml new file mode 100644 index 000000000..81aeed866 --- /dev/null +++ b/jjb/acumos/security-verification/security-verification-rebase-jobs.yaml @@ -0,0 +1,28 @@ +--- +# ============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========================================================= +# +- project: + name: security-verification-rebase + project: security-verification + project-name: security-verification + stream: + - master: + branch: '{stream}' + jobs: + - 'acumos-{project-name}-{stream}-rebase' diff --git a/jjb/acumos/system-integration/system-integration-rebase-jobs.yml b/jjb/acumos/system-integration/system-integration-rebase-jobs.yml new file mode 100644 index 000000000..d63fcb211 --- /dev/null +++ b/jjb/acumos/system-integration/system-integration-rebase-jobs.yml @@ -0,0 +1,28 @@ +--- +# ============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========================================================= +# +- project: + name: system-integration-rebase + project: system-integration + project-name: system-integration + stream: + - master: + branch: '{stream}' + jobs: + - 'acumos-{project-name}-{stream}-rebase' diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index c80cd45a3..b96a205b0 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -58,6 +58,22 @@ default: ssh://$GERRIT_USER@gerrit.onap.org:29418 description: SSH URL to Project Repo on ONAP Gerrit to clone repo +- parameter: + name: acumos-gerrit-parameters + parameters: + - string: + name: GERRIT_USER + default: nordix + description: Non-interactive user to stream Gerrit Events on Acumos Gerrit + - string: + name: GIT_BASE_HTTPS + default: https://gerrit.acumos.org/r/p + description: HTTPS URL to Project Repo on Acumos Gerrit to clone repo + - string: + name: GIT_BASE_SSH + default: ssh://$GERRIT_USER@gerrit.acumos.org:29418 + description: SSH URL to Project Repo on Acumos Gerrit to clone repo + # defaults for job build history - property: name: logrotate-default @@ -197,6 +213,29 @@ silent: true silent-start: true +# triggers for Acumos Gerrit +- trigger: + name: acumos-gerrit-trigger-change-merged + triggers: + - gerrit: + server-name: 'Acumos Gerrit' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: '{files}' + silent: true + silent-start: true + + # wrappers to use for jobs - wrapper: name: nordixinfra-jjb-creds-wrapper -- 2.25.1