X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=893d6b7236229b8d0f3097df2f45e7fdaf8d6951;hb=ed0e7cc5072ed37372a73bd952f0fc566fb739f7;hp=eda6fda0b95a23e8fe20ae3b9f887785bf286d81;hpb=5bb4581c51fde9a78d259d7460a48608ea5185b1;p=releng%2Fbuilder.git diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index eda6fda0b..893d6b723 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -82,13 +82,31 @@ name: PATCHES_TO_BUILD default: '' description: | - Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47) + Ordered list of patches to build in the format of project=changeset (checkout) or + project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47. + A topic is also allowed, for example: topic=binding-tlc-rpc + +- parameter: + name: build-order-parameter + parameters: + - string: + name: BUILD_ORDER + default: '{build-order}' + description: 'Build order for multipatch test when topic is used' + +- parameter: + name: build-fast-parameter + parameters: + - string: + name: BUILD_FAST + default: '{build-fast}' + description: 'Set true to build fast -Pq' - parameter: name: run-test-parameter parameters: - string: - name: RUNTEST + name: RUN_TEST default: '{run-test}' description: 'Set true to run test after build' @@ -190,7 +208,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' projects: - project-compare-type: ANT project-pattern: '{project}' @@ -200,6 +218,9 @@ file-paths: - compare-type: ANT pattern: '{files}' + forbidden-file-paths: + - compare-type: ANT + pattern: '{forbidden-files}' # TODO: Unify argument names across gerrit-trigger-* macros. - trigger: @@ -210,13 +231,19 @@ trigger-on: - change-merged-event - comment-added-contains-event: - comment-contains-value: 'remerge' + comment-contains-value: 'remerge$' projects: - project-compare-type: 'ANT' project-pattern: '{name}' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: '{files}' + forbidden-file-paths: + - compare-type: ANT + pattern: '{forbidden-files}' skip-vote: successful: true failed: true @@ -236,27 +263,6 @@ gerrit-build-unstable-codereview-value: 0 gerrit-build-notbuilt-codereview-value: 0 -# TODO: Unify argument names across gerrit-trigger-* macros. -- trigger: - name: gerrit-trigger-patch-sonar - triggers: - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-sonar' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - publisher: name: email-notification publishers: @@ -281,22 +287,42 @@ send-to: - recipients -- publisher: - name: jacoco-report - publishers: - - jacoco: - exec-pattern: "**/**.exec" - class-pattern: "**/classes" - source-pattern: "**/src/main/java" - exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**" - status-update: true - targets: - - branch: - healthy: 10 - unhealthy: 20 - - method: - healthy: 50 - unhealthy: 40 + +- builder: + # Installs the openstack cli into a virtualenv at /tmp/v/openstack + name: odl-openstack-install + builders: + - shell: !include-raw: odl-openstack-install.sh + +- builder: + name: odl-openstack-check-image-protection + builders: + - shell: !include-raw: odl-openstack-check-image-protection.sh + +- builder: + name: odl-openstack-cleanup-old-images + builders: + - shell: !include-raw: odl-openstack-cleanup-old-images.sh + +- builder: + name: odl-openstack-cleanup-orphaned-nodes + builders: + - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh + +- builder: + name: odl-openstack-cleanup-stale-nodes + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh + +- builder: + name: odl-openstack-cleanup-stale-stacks + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh + +- builder: + name: odl-openstack-cleanup-stale-volumes + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-volumes.sh - builder: # Deploys a maven site to Nexus using lftools nexus-zip command @@ -321,22 +347,11 @@ - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh - builder: - name: opendaylight-infra-push-gerrit-patch - # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to - # Gerrit in an automated fashion. This is meant for tasks that creates - # the same patch regularly and needs the ability to detect if an unreviewed - # patch already exists. In which case it will update the existing patch. - # - # Note: This patch assumes the $WORKSPACE contains the project repo with - # the files changed already "git add" and waiting for a "git commit" call. - # - # This script requires the following JJB variables to be passed in: - # {project} Gerrit project-name - # {gerrit-topic} Gerrit topic, please make a unique topic. - # {gerrit-commit-message} Commit message to assign to commit. - # NOTE: Requires git review to be installed on node. + name: opendaylight-apex-stack + # opendaylight-apex-stack.sh has a required variable {stack-template} that + # must be passed into this macro. builders: - - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh + - shell: !include-raw: opendaylight-infra-stack.sh - builder: name: distribute-build-url @@ -433,6 +448,24 @@ settings: '{settings}' global-settings: '{global-settings}' +- publisher: + name: releng-openstack-stack-delete + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - SUCCESS + - UNSTABLE + build-steps: + - shell: | + #!/bin/bash -l + echo "Deleting $STACK_NAME" + openstack stack delete --yes "$STACK_NAME" + mark-unstable-if-failed: false + - builder: name: releng-stage-release builders: @@ -448,7 +481,9 @@ files: - file-id: npmrc target: '$HOME/.npmrc' - - file-id: rackspace-heat + - file-id: pipconf + target: '$HOME/.config/pip/pip.conf' + - file-id: clouds-yaml target: '$HOME/.config/openstack/clouds.yaml' - timeout: type: absolute @@ -462,28 +497,18 @@ - openstack: single-use: true -- builder: - # TODO: Verify signature after downloading users public key from a locally created - # repository instead of the public keymesh. This requires a process in place to get ODL - # developers public keys into a local repository without increasing the job thoughput. - name: verify-gpg-signature - builders: - - shell: !include-raw: verify-gpg-signatures.sh - -- builder: - name: opendaylight-infra-jjbini - builders: - - config-file-provider: - files: - - file-id: 'jjbini' - target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini' - - publisher: name: opendaylight-infra-generate-csit-status-report publishers: - postbuildscript: builders: - - shell: !include-raw: generate-csit-status-report.sh - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: false + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: !include-raw: generate-csit-status-report.sh + mark-unstable-if-failed: true