From: Eric Ball Date: Mon, 28 Oct 2019 21:16:22 +0000 (+0000) Subject: Merge "Add ci validation script" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=2f004195aa71e593290d00152460d42e3ddefe36;hp=7cb83b7f5818727f5293fc02b96d5e5f065a78a1 Merge "Add ci validation script" --- 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/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index 6709397..dd16cf0 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v1-standard-1 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg index 31c020b..6ed2429 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v2-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg index 538ebcb..3fccd4a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v1-standard-16 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg index 8d05e42..17acbe1 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v2-highcpu-32 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg index 0a79f04..fb8a055 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v2-highcpu-8 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-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index f031301..2be2952 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -181,8 +181,8 @@ - lf-infra-publish - job-template: - id: kni-blueprint-pae-verify-deploy-aws - name: '{project-name}-verify-deploy-aws' + id: kni-verify-deploy-aws + name: 'kni-{project-name}-verify-deploy-aws' ###################### # Default parameters # @@ -254,7 +254,7 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - basedir: 'blueprint-pae' + basedir: '{project-name}' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/kni/installer.git' @@ -291,8 +291,8 @@ - lf-infra-publish - job-template: - id: kni-blueprint-pae-verify-deploy-libvirt - name: '{project-name}-verify-deploy-libvirt' + id: kni-verify-deploy-libvirt + name: 'kni-{project-name}-verify-deploy-libvirt' ###################### # Default parameters # @@ -376,7 +376,7 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - basedir: 'blueprint-pae' + basedir: '{project-name}' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/kni/installer.git' diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 781e66f..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 # ########### @@ -114,7 +140,7 @@ python-decoratortools yum-utils usermode pigz # We need a specific version of mock (1.4.14) and devtools # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors - wget http://mirror.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ + wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm sudo alien -d *.rpm sudo dpkg -i *.deb 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/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml index 62e7993..f3b41ff 100644 --- a/jjb/kni/kni_installer.yaml +++ b/jjb/kni/kni_installer.yaml @@ -13,9 +13,19 @@ - project: name: kni-blueprint-pae project: 'kni/blueprint-pae' - project-name: kni-blueprint-pae + project-name: blueprint-pae stream: master branch: master jobs: - - kni-blueprint-pae-verify-deploy-aws - - kni-blueprint-pae-verify-deploy-libvirt + - kni-verify-deploy-aws + - kni-verify-deploy-libvirt + +- project: + name: kni-blueprint-basic-3-masters + project: 'kni/blueprint-basic-3-masters' + project-name: blueprint-basic-3-masters + stream: master + branch: master + jobs: + - kni-verify-deploy-aws + - kni-verify-deploy-libvirt 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/ta/caas-cpupooler.yaml b/jjb/ta/caas-cpupooler.yaml index 3307550..76ee933 100644 --- a/jjb/ta/caas-cpupooler.yaml +++ b/jjb/ta/caas-cpupooler.yaml @@ -5,7 +5,7 @@ project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-etcd.yaml b/jjb/ta/caas-etcd.yaml index 171ead4..f1715d7 100644 --- a/jjb/ta/caas-etcd.yaml +++ b/jjb/ta/caas-etcd.yaml @@ -5,7 +5,7 @@ project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-kubedns.yaml b/jjb/ta/caas-kubedns.yaml index 9e8d3aa..26678c6 100644 --- a/jjb/ta/caas-kubedns.yaml +++ b/jjb/ta/caas-kubedns.yaml @@ -5,7 +5,7 @@ project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-metrics.yaml b/jjb/ta/caas-metrics.yaml index ce68308..5cb90bc 100644 --- a/jjb/ta/caas-metrics.yaml +++ b/jjb/ta/caas-metrics.yaml @@ -5,7 +5,7 @@ project-type: - merge - verify - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-16g stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-storage.yaml b/jjb/ta/caas-storage.yaml new file mode 100644 index 0000000..413f0fe --- /dev/null +++ b/jjb/ta/caas-storage.yaml @@ -0,0 +1,25 @@ +- project: + name: ta-caas-storage-amd64 + project: ta/caas-storage + project-name: ta-caas-storage-amd64 + project-type: + - merge + - verify + build-node: centos7-builder-2c-8g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-storage-arm64 + project: ta/caas-storage + project-name: ta-caas-storage-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta 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}' diff --git a/packer/common-packer b/packer/common-packer index 837c821..57648e1 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 837c821df6fa77bd81a73ecbee94bdd8e24b3172 +Subproject commit 57648e1600c3c2457900ad4872f26d8f5cd679c7