From: Fatih Degirmenci Date: Mon, 8 Apr 2019 22:04:41 +0000 (+0200) Subject: bugfix: Use correct macros for cloud-infra-verify-engine jobs X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=43c234548ef1a72b3ff9f6b6a74af898f188e9c4;p=infra%2Fcicd.git bugfix: Use correct macros for cloud-infra-verify-engine jobs Change-Id: Ib69dc57b7f7efbe4d88b5456ebce5818dfd8f8b3 --- diff --git a/jjb/cloud-infra/.swp b/jjb/cloud-infra/.swp new file mode 100644 index 000000000..9d4164426 Binary files /dev/null and b/jjb/cloud-infra/.swp differ diff --git a/jjb/cloud-infra/README.md b/jjb/cloud-infra/README.md new file mode 100644 index 000000000..bc6d72523 --- /dev/null +++ b/jjb/cloud-infra/README.md @@ -0,0 +1,56 @@ +# CI/CD Pipelines for Cloud Infra + +Cloud Infra has various pipelines to automatically test various aspects +of the software and hardware. + + +## Patchset Verification + +There are several jobs that are created and used for verifying changes +done to various parts of the Cloud Infra no matter if it is the deployment +framework itself, the ansible playbooks and roles that are developed for +utilizing open source components, the scenarios, hardware configuration +or the test frameworks themselves. + +High level details about these jobs can be seen in corresponding sections +below. + +## Post Merge + +TBD + +## Periodic + +TBD + +# Patchset Verification + +This section contains the details about the verification done against the +patches submitted to Nordix Gerrit for Code Review. + +All the changes coming to Cloud Infra are subject to verification and reviews. +In order for a change to be merged to master, change must have + +* Verified +1 from CI/CD +* At least one +2 from core reviewers +* No -1 + +It is important to note that if a change has an outstanding -1 from CI/CD, core +reviewers tend not to review it unless they are explicitly asked to review it to +provide early feedback. + +## Deployment Framework + +Any change that impacts deployment framework, engine, itself are subject to +verification before it can be submitted for merge to master. + +The verification consists of +* creating of + +# New Versions of Open Source Components + +# Scenarios and Sofware Configuration + +# Hardware Configuration + +# Test Frameworks diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml index cf0fcbbd9..932d478d9 100644 --- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml @@ -274,7 +274,7 @@ refspec: $GERRIT_REFSPEC builders: - - 'cloud-infra-verify-test-macro' + - 'cloud-infra-verify-{phase}-macro' # ------------------------------- # builder macros @@ -289,7 +289,7 @@ !include-raw: ./cloud-infra-deploy.sh - builder: - name: 'cloud-infra-verify-test-macro' + name: 'cloud-infra-verify-functest-macro' builders: - shell: !include-raw: ./prepare-for-test.sh diff --git a/jjb/cloud-infra/cloud-infra-verify-test.yaml.bak b/jjb/cloud-infra/cloud-infra-verify-test.yaml.bak new file mode 100644 index 000000000..4c7e16aee --- /dev/null +++ b/jjb/cloud-infra/cloud-infra-verify-test.yaml.bak @@ -0,0 +1,140 @@ +--- +# +# ============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========================================================= + +#-------------------------------------------------------------------------------------- +# The jobs declared in this JJB configuration file are used for verifying patches +# that are sent to the repositories below +# - cloud-infra/test +# +# These jobs verify changes that +# - implement new features or fix bugs to the playbooks and roles used for utilizing +# open source test frameworks such as opnfv/functest, and opnfv/yardstick +# - bump versions of the open source test frameworks +# +# These jobs are set to run on slaves with label vpod-test-ubuntu1604. +# The slaves have +# - Ubuntu1604 as the base distro +# - nested virtualization +# - internet access +# - passwordless sudo +# - 16 CPUs/32GB RAM/200 GB Disk +# - docker, git vim curl wget zip unzip chrony apt-transport-https ca-certificates curl +# gnupg-agent software-properties-common docker-ce docker-ce-cli containerd.io openjdk-8-jre +# +# The slaves should have a promoted version of a cloud infra scenario deployed on them. +# Currently k8-calico-nofeature scenario is deployed on the slaves. +#-------------------------------------------------------------------------------------- + +- project: + name: 'cloud-infra-verify-test' + + project: 'infra/test' + + stream: + - 'master': + branch: '{stream}' + disabled: 'false' + + os: + - ubuntu1804: + disabled: 'false' + distribution: 'ubuntu18' + - centos7: + disabled: 'true' + distribution: 'centos7' + + type: + - virtual + + jobs: + - 'cloud-infra-verify-test-{os}-{type}-{stream}' + +- job-template: + name: 'cloud-infra-verify-test-{os}-{type}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + parameters: + - project-parameters: + project: '{project}' + branch: '{branch}' + - nordix-gerrit-parameters + - label: + name: SLAVE_LABEL + default: 'vpod-test-{os}' + description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.' + - string: + name: DISTRIBUTION + default: '{distribution}' + description: 'Distribution to use for configuring target nodes (networking etc.)' + - string: + name: TESTFW_NAME + default: 'opnfv/functest' + description: 'Test framework to use' + - string: + name: SUITE_NAME + default: 'healthcheck' + description: 'Test suite to use' + + properties: + - logrotate + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'cloud-infra-verify-test-{os}-.*' + block-level: 'NODE' + - throttle: + max-per-node: 1 + max-total: 3 + option: project + + wrappers: + - build-timeout: + timeout: 120 + - fix-workspace-permissions + + scm: + - git-scm-gerrit: + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh + branch: '{branch}' + refspec: $GERRIT_REFSPEC + + triggers: + - nordix-gerrit-trigger-patchset-created: + project: 'infra\/test' + branch: '{branch}' + files: '**' + + builders: + - 'cloud-infra-verify-testfw-macro' + +# ------------------------------- +# builder macros +# ------------------------------- + +- builder: + name: 'cloud-infra-verify-testfw-macro' + builders: + - shell: + !include-raw: ./cloud-infra-test.sh + +# vim: set ts=2 sw=2 expandtab: