X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=7c0a9164318df0009cc234580f8e560e593c383e;hb=93a5304ef04620630cbd6de14694607048bf2aa3;hp=74f42ae9f9cbf8d95ce8bbfb408868a5c46ff669;hpb=caccfb10f843004a6d9cb4945c77f3d644f47f11;p=releng%2Fbuilder.git diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 74f42ae9f..7c0a91643 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -59,22 +59,6 @@ further details. https://docs.openstack.org/developer/python-openstackclient/ -- parameter: - name: build-tag - parameters: - - string: - name: BUILD_TAG - default: '' - description: 'Tag in Git to checkout' - -- parameter: - name: controller-version-parameter - parameters: - - string: - name: ODL_VERSION - default: '{odl_version}' - description: 'Controller version (for use with openstacks networking_odl project)' - - parameter: name: patches-to-build-parameter parameters: @@ -118,22 +102,6 @@ default: 'master' description: 'distribution repo branch to build with' -- parameter: - name: p2zip-parameter - parameters: - - string: - name: P2ZIP_URL - default: '' - description: 'Nexus staging profile id' - -- parameter: - name: stage-id-parameter - parameters: - - string: - name: STAGING_PROFILE_ID - default: '{stage-id}' - description: 'Nexus staging profile id' - - parameter: name: maven-exec parameters: @@ -180,14 +148,6 @@ skip-tag: true choosing-strategy: '{choosing-strategy}' -- wrapper: - name: build-timeout - wrappers: - - timeout: - type: absolute - timeout: 360 - fail: true - # This is a single macro to use for all jobs who vote on every (relevant) patch set. # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs, # in order to prevent Jenkins from starting only a subset and still voting Verified+1. @@ -263,27 +223,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: @@ -308,57 +247,6 @@ send-to: - recipients - -- 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 - name: opendaylight-infra-deploy-maven-site - builders: - - lf-provide-maven-settings: - global-settings-file: global-settings - settings-file: '{settings-file}' - - lf-infra-create-netrc: - server-id: opendaylight-site - - shell: !include-raw-escape: - - global-jjb/shell/lftools-install.sh - - opendaylight-infra-deploy-maven-site.sh - - lf-provide-maven-settings-cleanup - - builder: name: opendaylight-infra-stack # opendaylight-infra-stack.sh has a required variable {stack-template} that @@ -367,6 +255,13 @@ - shell: !include-raw: opendaylight-infra-stack.sh - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh +- builder: + 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-stack.sh + - builder: name: distribute-build-url # Place URL of the current run of a build job to a file at given path. @@ -390,78 +285,6 @@ builders: - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi' -- builder: - name: jacoco-nojava-workaround - builders: - - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes' - -- builder: - name: check-clm - builders: - - sonatype-clm: - application-name: '{application-name}' - -- builder: - name: releng-check-unicode - builders: - - shell: | - $WORKSPACE/scripts/check-unicode.sh jjb/ - -- builder: - name: provide-maven-settings - builders: - - config-file-provider: - files: - - file-id: '{global-settings-file}' - variable: 'GLOBAL_SETTINGS_FILE' - - file-id: '{settings-file}' - variable: 'SETTINGS_FILE' - -- builder: - name: releng-fetch-p2zip-if-necessary - builders: - - shell: | - # Cleanup any existing zips and metadata before we download the new update site - rm -f *.zip *.xml - - conditional-step: - condition-kind: strings-match - condition-string1: '$P2ZIP_URL' - condition-string2: '' - condition-basedir: workspace - steps: - # TODO: Figure out latest snapshot version number to pull rather than hardcoding 1.1.1-SNAPSHOT - - maven-target: - maven-version: '{maven-version}' - goals: > - org.apache.maven.plugins:maven-dependency-plugin:get - org.apache.maven.plugins:maven-dependency-plugin:copy - -V -B - -Dartifact=org.opendaylight.yangide:org.opendaylight.yangide.update-site:1.1.1-SNAPSHOT:zip - -DoutputDirectory=$WORKSPACE - settings: '{settings}' - global-settings: '{global-settings}' - -- builder: - name: releng-generate-p2pom - builders: - - shell: !include-raw: generate-p2pom.sh - -- builder: - name: releng-update-p2composite-metadata - builders: - - shell: !include-raw: update-p2composite-metadata.sh - - conditional-step: - condition-kind: file-exists - condition-filename: deploy-composite-repo.xml - condition-basedir: workspace - steps: - - maven-target: - maven-version: '{maven-version}' - pom: 'deploy-composite-repo.xml' - goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r' - settings: '{settings}' - global-settings: '{global-settings}' - - publisher: name: releng-openstack-stack-delete publishers: @@ -475,17 +298,11 @@ - UNSTABLE build-steps: - shell: | - #!/bin/bash + #!/bin/bash -l echo "Deleting $STACK_NAME" - source "/tmp/v/openstack/bin/activate" openstack stack delete --yes "$STACK_NAME" mark-unstable-if-failed: false -- builder: - name: releng-stage-release - builders: - - shell: !include-raw: stage-release.sh - - wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by OpenDaylight infra.