From: Eric Ball Date: Wed, 23 Oct 2019 16:37:33 +0000 (+0000) Subject: Merge "Add new job to verify blueprint-basic-3-masters" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=9a9833b1f48b3a95a32816c411297cd3c6b2d1c8;hp=d5b21ecbd03e8023adf50618e0bc8b9313c82f72 Merge "Add new job to verify blueprint-basic-3-masters" --- diff --git a/global-jjb b/global-jjb index 2cf0913..381cc03 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 2cf091330ff475f60646d4fa88e537bc87b89d6f +Subproject commit 381cc03ffab74fb347bd1d8a17e7bc2703111650 diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml new file mode 100644 index 0000000..8e3c665 --- /dev/null +++ b/jjb/akraino-templates/akraino-icn-templates.yaml @@ -0,0 +1,96 @@ +--- +# +## Copyright (c) 2019 Intel Corporation +## +## 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. +## +# +- job-template: + id: akraino-project-stream-verify-gate + name: '{project-name}-{stream}-verify-{gate}' + archive-artifacts: > + **/*.log + build-days-to-keep: 30 + build-timeout: 60 + stream: master + gate: bashate + project-type: freestyle + submodule-recursive: true + node: '{build-node}' + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + lftools-version: '{lftools-version}' + + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}/{project}.git' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: false + choosing-strategy: 'gerrit' + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - change-merged-event + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: '**/*' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + readable-message: true + + builders: + - shell: 'make {gate}' + + publishers: + - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index bc46b57..a655fdd 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -73,6 +73,32 @@ choosing-strategy: '{choosing-strategy}' basedir: '{basedir}' +- scm: + name: ta-lf-infra-gerrit-scm-merge + scm: + - ta-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '{refspec}' + branch: '{branch}' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + basedir: '{basedir}' + choosing-strategy: default + +- scm: + name: ta-lf-infra-gerrit-scm-verify + scm: + - ta-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '{refspec}' + branch: '{branch}' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + basedir: '{basedir}' + choosing-strategy: gerrit + ########### # BUILDER # ########### diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml index ca09e1a..d340775 100644 --- a/jjb/akraino-templates/akraino-ta-common-templates.yaml +++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml @@ -46,14 +46,13 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' scm: - - ta-lf-infra-gerrit-scm: + - ta-lf-infra-gerrit-scm-{project-type}: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/{project}.git' refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' - choosing-strategy: 'gerrit' basedir: '$GERRIT_PROJECT' triggers: diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml index 1bdd573..0be9fa7 100644 --- a/jjb/camunda_workflow/camunda_workflow.yaml +++ b/jjb/camunda_workflow/camunda_workflow.yaml @@ -21,6 +21,10 @@ mvn-settings: camunda_workflow-settings mvn-params: '-f akraino' nexus-iq-namespace: 'akraino-' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' build-node: centos7-builder-2c-1g stream: master jobs: diff --git a/jjb/icn/icn.yaml b/jjb/icn/icn.yaml new file mode 100644 index 0000000..3e6e685 --- /dev/null +++ b/jjb/icn/icn.yaml @@ -0,0 +1,29 @@ +--- +# +## Copyright (c) 2019 Intel Corporation +## +## 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. +## +# +- project: + name: icn + project: icn + project-name: icn + gate: + - bashate + build-node: icn-dev + stream: + - master: + branch: master + jobs: + - akraino-project-stream-verify-gate diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml index ce31a82..76aa2b4 100644 --- a/jjb/portal_user_interface/portal_user_interface.yaml +++ b/jjb/portal_user_interface/portal_user_interface.yaml @@ -21,6 +21,10 @@ mvn-settings: portal_user_interface-settings mvn-params: '-f AECPortalMgmt' nexus-iq-namespace: 'akraino-' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' build-node: centos7-builder-2c-1g stream: master jobs: diff --git a/jjb/regional_controller/api-server.yaml b/jjb/regional_controller/api-server.yaml index f98aabc..0b94da7 100644 --- a/jjb/regional_controller/api-server.yaml +++ b/jjb/regional_controller/api-server.yaml @@ -21,6 +21,10 @@ mvn-settings: regional_controller-settings mvn-params: '' nexus-iq-namespace: 'akraino-' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_regional_controller' build-node: centos7-builder-2c-1g stream: master jobs: diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml index dbcba48..481aa59 100644 --- a/jjb/validation/validation-docker.yaml +++ b/jjb/validation/validation-docker.yaml @@ -127,6 +127,9 @@ - shell: | #!/bin/bash -ex make -k -C docker push-all + - shell: | + #!/bin/bash -ex + docker system prune -af - job-template: name: 'validation-docker-manifest-{stream}'