From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 17 Jul 2017 02:06:36 +0000 (-0700)
Subject: Fix surefire logs in project distribution-check
X-Git-Tag: release/nitrogen~271^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=028815c63fe2549bf4332b9887edf1736c66693f;p=releng%2Fbuilder.git

Fix surefire logs in project distribution-check

- Controller deploy script should not wipe out workspace.
- Use macro integration-csit-archive-build to archive robot.
- Clean up {archive-artifacts} variable.

Change-Id: I263d4a07060361096774423ddbb786ce17c3f45c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index cb8a41136..ef41e3912 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -20,7 +20,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+          artifacts: '{archive-artifacts}'
       - integration-patch-refspec:
           branch: '$GERRIT_REFSPEC'
 
@@ -89,7 +89,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
+          artifacts: '{archive-artifacts}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
@@ -203,7 +203,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+          artifacts: '{archive-artifacts}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
@@ -251,15 +251,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
+      - integration-csit-archive-build
       - lf-infra-publish
 
 - job-template:
@@ -282,7 +274,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/*.hprof'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-bundle-url:
@@ -328,7 +320,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/*.hprof'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-bundle-url:
diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 11aeb60b4..11f29b5da 100644
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -24,7 +24,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
@@ -79,13 +79,5 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
+      - integration-csit-archive-build
       - lf-infra-publish
diff --git a/jjb/integration/integration-distribution-check.sh b/jjb/integration/integration-distribution-check.sh
index 3099a010d..0b6b446fd 100644
--- a/jjb/integration/integration-distribution-check.sh
+++ b/jjb/integration/integration-distribution-check.sh
@@ -9,8 +9,8 @@ BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSI
 echo "Kill any controller running"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-echo "Clean workspace"
-rm -rf *
+echo "Clean Existing distribution"
+rm -rf ${BUNDLEFOLDER}
 
 echo "Copying the distribution..."
 cp "${BUNDLE_PATH}" .
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 967186982..221fda6e1 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -245,7 +245,7 @@
           project: '$GERRIT_PROJECT'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
@@ -380,7 +380,7 @@
           project: 'integration/distribution'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt'
+          artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: mvn33