file-upload ready for testing

nodes/192.168.65.100.json

@@ -45,6 +45,6 @@
     }
   },
   "webmasterscript": {
-    "branch": "master"
+    "branch": "file-upload"
   }
 }

site-cookbooks/paasage/templates/default/masterscript.sh.erb

@@ -5,7 +5,6 @@ VERSION=<%= @version %>
 export PAASAGE_CONFIG_DIR=/etc/paasage
 CURRENT_STEP=$1
 RUN_ID=$2
-MODEL_FILE_NAME=$3
 echo "value CURRENT_STEP=$CURRENT_STEP"
 echo "value MODEL_FILE_NAME=$MODEL_FILE_NAME"
 echo "value RUN_ID=$RUN_ID"
@@ -14,14 +13,19 @@ then
 CURRENT_STEP=ALL
 fi
 
-MODEL_FULL_FILE_NAME=/tmp/${RUN_ID}-${MODEL_FILE_NAME}
+FLEXIANT_PROVIDER_MODEL_FULL_FILENAME=/tmp/${RUN_ID}_flexiant_cloudprovider_model.xmi
+OMISTACK_PROVIDER_MODEL_FULL_FILENAME=/tmp/${RUN_ID}_omistack_cloudprovider_model.xmi
+AMAZONEC2_PROVIDER_MODEL_FULL_FILENAME=/tmp/${RUN_ID}_amazonec2_cloudprovider_model.xmi
+GWDG_PROVIDER_MODEL_FULL_FILENAME=/tmp/${RUN_ID}_gwdg_cloudprovider_model.xmi
+
+MODEL_FULL_FILE_NAME=/tmp/${RUN_ID}_application_model.xmi
 CAMEL_MODEL_ID=CAMEL_${RUN_ID}
 DEPLOYMENT_MODEL_ID=DEPLOY_${CAMEL_MODEL_ID}
 CP_MODEL_ID_FULL_FILE_NAME=/tmp/${RUN_ID}-CP_OUTPUT_MODEL_ID
 RP_MODEL_ID_FULL_FILE_NAME=/tmp/${RUN_ID}-RP_OUTPUT_MODEL_ID
 CHOSEN_SOLVER_FULL_FILE_NAME=/tmp/${RUN_ID}-CHOOSEN_SOLVER
 
-MODEL_URL=http://jenkins.paasage.cetic.be/job/USE_CASES/lastSuccessfulBuild/artifact/target/$MODEL_FILE_NAME
+#MODEL_URL=http://jenkins.paasage.cetic.be/job/USE_CASES/lastSuccessfulBuild/artifact/target/$MODEL_FILE_NAME
 BASE_DIR=/home/$INSTALL_USER
 
 if [ -e "$CP_MODEL_ID_FULL_FILE_NAME" ]
@@ -43,15 +47,54 @@ fi
 if [ "z$CURRENT_STEP" = "zSTEP_1" -o "z$CURRENT_STEP" = "zALL" ]
 then
 
-  rm -f $MODEL_FULL_FILE_NAME
-  wget --output-document=$MODEL_FULL_FILE_NAME $MODEL_URL
+#  rm -f $MODEL_FULL_FILE_NAME
+#  wget --output-document=$MODEL_FULL_FILE_NAME $MODEL_URL
 
-  # Step 1: load model into cdo server
+  echo "Loading Application model"
   pushd $BASE_DIR/init/app
     java -jar init-$VERSION-jar-with-dependencies.jar  $MODEL_FULL_FILE_NAME  $CAMEL_MODEL_ID
-   /etc/paasage/mysqldump.sh  $RUN_ID $CURRENT_STEP
   popd
-  echo "Metamodels and models loaded, about to run cp generator"
+  echo "Application model loaded."
+
+  if [ -e "$FLEXIANT_PROVIDER_MODEL_FULL_FILENAME" ]
+  then
+    echo "Loading Flexiant Cloud provider model"
+    pushd $BASE_DIR/init/app
+      java -jar init-$VERSION-jar-with-dependencies.jar  $FLEXIANT_PROVIDER_MODEL_FULL_FILENAME  upperware-models/fms/Flexiant
+    popd
+    echo "Flexiant Cloud provider model loaded."
+  fi
+
+  if [ -e "$GWDG_PROVIDER_MODEL_FULL_FILENAME" ]
+  then
+    echo "Loading GWDG Cloud provider model"
+    pushd $BASE_DIR/init/app
+      java -jar init-$VERSION-jar-with-dependencies.jar  $GWDG_PROVIDER_MODEL_FULL_FILENAME  upperware-models/fms/GWDG
+    popd
+    echo "GWDG Cloud provider model loaded."
+  fi
+
+  if [ -e "$AMAZONEC2_PROVIDER_MODEL_FULL_FILENAME" ]
+  then
+    echo "Loading GWDG Cloud provider model"
+    pushd $BASE_DIR/init/app
+      java -jar init-$VERSION-jar-with-dependencies.jar  $AMAZONEC2_PROVIDER_MODEL_FULL_FILENAME  upperware-models/fms/AmazonEC2
+    popd
+    echo "AmazonEC2 Cloud provider model loaded."
+  fi
+
+  if [ -e "$OMISTACK_PROVIDER_MODEL_FULL_FILENAME" ]
+  then
+    echo "Loading OMISTACK Cloud provider model"
+    pushd $BASE_DIR/init/app
+      java -jar init-$VERSION-jar-with-dependencies.jar  $OMISTACK_PROVIDER_MODEL_FULL_FILENAME  upperware-models/fms/Omistack
+    popd
+    echo "OMISTACK Cloud provider model loaded."
+  fi
+
+  pushd $BASE_DIR/init/app
+    /etc/paasage/mysqldump.sh  $RUN_ID $CURRENT_STEP
+  popd
   if [ "z$CURRENT_STEP" != "zALL" ]
   then
     exit 0