From: Yolanda Robla <yroblamo@redhat.com>
Date: Thu, 20 Sep 2018 08:05:21 +0000 (+0200)
Subject: Add fixes in openci job
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=5e377b0e12e10b3575d0f50c3864f9501ac2026e

Add fixes in openci job

Force workspace cleanup
Do not use credentials plugin, but hardcode it.

Change-Id: I5b6e59382c25fc75a748f90fbd030521dac9071f
Signed-off-by: Yolanda Robla <yroblamo@redhat.com>
---

diff --git a/jjb/openci/create-cde.sh b/jjb/openci/create-cde.sh
index b4b273a32..12ede6310 100755
--- a/jjb/openci/create-cde.sh
+++ b/jjb/openci/create-cde.sh
@@ -34,6 +34,10 @@ cat <<EOF > ./json_body.txt
 }
 EOF
 
+# temporary: until we can embed credentials plugin
+ACTIVEMQ_USER="openci"
+ACTIVEMQ_PASSWORD="openciP@ssw0rd"
+
 openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
 
 echo "Constructed $PUBLISH_EVENT_TYPE"
diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index 3cacee65d..40e61ce7e 100644
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -47,11 +47,7 @@
       - 'opnfv-build-defaults'
 
     wrappers:
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: openci-connect-activemq
-              username: ACTIVEMQ_USER
-              password: ACTIVEMQ_PASSWORD
+      - workspace-cleanup
 
     triggers:
       - jms-messaging: