Merge "Remove jjb custom scripting"

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8b5dd7760a46aa80bc727d9563b07c7e29d2b52d..37b962ca270f46e96156b9181a9178cdaeaa28cc 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -94,7 +94,7 @@
     name: integration-gerrit-scm
     scm:
         - git:
-            credentials-id: '{credentials-id}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             basedir: '{basedir}'
             refspec: '{refspec}'
@@ -111,7 +111,7 @@
     name: integration-distribution-scm
     scm:
         - git:
-            credentials-id: '{credentials-id}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             basedir: 'distribution'
             url: '$DISTROGITURL'
             refspec: ''
@@ -332,17 +332,6 @@
             !include-raw:
                 - include-raw-integration-deploy-controller-run-test.sh
 
-# Macro: include-raw-integration-deploy-robot-testing
-# Operation: this macro only resolves suite path from testplan
-# Used by: {project}-openstack-{functionality}-daily-{openstack}-{odl} job templates
-
-- builder:
-    name: include-raw-integration-deploy-devstack-testing
-    builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-devstack-testing.sh
-
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
 # Used by: {project}-csit-3node-* job templates
@@ -476,7 +465,7 @@
                     mkdir $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.csv $WORKSPACE/archives || true  # Don't fail if file missing
+                    mv *log* *.log *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True