X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=3a9f5436c626550c2299b2d66a7912fa949b07ca;hb=9da212b4ab99c84cf20376b5bb22081a5c87e8b5;hp=1f5ab471086f997616652132370e7bd14edb106d;hpb=7692a6bcdc9d0bb37899b1b2d1a9bba0f727ebd7;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1f5ab4710..3a9f5436c 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -21,9 +21,11 @@
           description: 'Parameter to identify an ODL Gerrit project'
       - string:
           name: ARCHIVE_ARTIFACTS
+          # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
           default: >
               {artifacts}
               **/target/surefire-reports/*-output.txt
+              **/target/failsafe-reports/failsafe-summary.xml
               **/hs_err_*.log
               **/target/feature/feature.xml
               **/*.hprof
@@ -39,7 +41,10 @@
       - string:
           name: GERRIT_REFSPEC
           default: '{refspec}'
-          description: "GERRIT_REFSPEC parameter if not given by trigger"
+          description: |
+              Gerrit reference to checkout (ex: refs/heads/master,
+              refs/changes/48/61548/1 where 61548 is Gerrit change ID, 1 is
+              patch number and 48 is last two digits of change ID)
       - string:
           name: STACK_NAME
           default: '$SILO-$JOB_NAME-$BUILD_NUMBER'
@@ -252,15 +257,6 @@
             unstable: true
             notbuilt: true
 
-- publisher:
-    name: archive-artifacts
-    publishers:
-      - archive:
-          artifacts: '{artifacts}'
-          allow-empty: true
-          fingerprint: true
-          latest-only: true
-
 - publisher:
     name: email-notification
     publishers:
@@ -302,6 +298,20 @@
                 healthy: 50
                 unhealthy: 40
 
+- 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
@@ -405,12 +415,12 @@
 - builder:
     name: releng-generate-p2pom
     builders:
-      - shell: !include-raw: include-raw-generate-p2pom.sh
+      - shell: !include-raw: generate-p2pom.sh
 
 - builder:
     name: releng-update-p2composite-metadata
     builders:
-      - shell: !include-raw: include-raw-update-p2composite-metadata.sh
+      - shell: !include-raw: update-p2composite-metadata.sh
       - conditional-step:
           condition-kind: file-exists
           condition-filename: deploy-composite-repo.xml
@@ -426,7 +436,7 @@
 - builder:
     name: releng-stage-release
     builders:
-      - shell: !include-raw: include-raw-stage-release.sh
+      - shell: !include-raw: stage-release.sh
 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
@@ -452,57 +462,13 @@
       - openstack:
           single-use: true
 
-- builder:
-    name: packer-validate
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: |
-          cd packer
-          varfiles="../packer/vars/*"
-          templates="../packer/templates/*"
-          provision="../packer/provision/*.sh"
-          for v in $varfiles; do
-              [[ "${v##*/}" =~ ^(cloud-env.*)$ ]] && continue
-              for t in $templates; do
-                  export PACKER_LOG="yes" && \
-                  export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \
-                              packer.io validate -var-file=$CLOUDENV \
-                              -var-file=$v $t
-                  if [ $? -ne 0 ]; then
-                      break
-                  fi
-              done
-          done
-          for p in $provision; do
-              /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-          done
-
-
-- builder:
-    name: packer-build
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: |
-          cd packer
-          export PACKER_LOG="yes" && \
-          export PACKER_LOG_PATH="packer-build.log" && \
-                      packer.io build -color=false -var-file=$CLOUDENV \
-                       -var-file=../packer/vars/{platform}.json \
-                       ../packer/templates/{template}.json
-
 - 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: include-raw-verify-gpg-signatures.sh
+      - shell: !include-raw: verify-gpg-signatures.sh
 
 - builder:
     name: opendaylight-infra-jjbini
@@ -544,7 +510,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -583,7 +549,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -678,6 +644,7 @@
               clean install dependency:tree
               -DoutputFile=dependency_tree.txt -s fake_remotes.xml
               -Pq
+              -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
           java-opts: