X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenci%2Fcreate-cde.sh;h=9780119ce2feb3fb728f950aba64b21e07a06a27;hb=c04f88ca91b7612c70bcae9c8a70a98d5bd46c6e;hp=12ede6310dbf0c7c1430437b1f850e6698f7bb3e;hpb=5e377b0e12e10b3575d0f50c3864f9501ac2026e;p=releng.git

diff --git a/jjb/openci/create-cde.sh b/jjb/openci/create-cde.sh
index 12ede6310..9780119ce 100755
--- a/jjb/openci/create-cde.sh
+++ b/jjb/openci/create-cde.sh
@@ -11,6 +11,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+export PS1=${PS1:-}
+
 # This script creates CompositionDefinedEvent
 
 git clone https://gitlab.openci.io/openci/prototypes.git
@@ -29,20 +31,17 @@ cat <<EOF > ./json_body.txt
     "buildUrl": "$BUILD_URL",
     "branch": "master",
     "origin": "$PUBLISH_EVENT_ORIGIN",
+    "scenario": "$DEPLOY_SCENARIO",
     "compositionName": "$DEPLOY_SCENARIO",
     "compositionMetadataUrl": "$SCENARIO_METADATA_LOCATION"
 }
 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"
 echo "--------------------------------------------"
 cat  ./json_body.txt
 echo "--------------------------------------------"
 
+python openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
+
 deactivate