added

DFEAGILEDEVOPS · Nov 1, 2017 · d6ed6c5 · d6ed6c5
1 parent 4743550
commit d6ed6c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/dfe_deploy_oc.sh b/dfe_deploy_oc.sh
@@ -4,12 +4,14 @@ oc_openshift_credentials=$2
 oc_dfe_deploy_url=$3
 oc_nexus_repo=$4
 oc_project=$5
+oc_app=$6
 # Print args
 echo oc_nexus_credentials=$oc_nexus_credentials
 echo oc_openshift_credentials=$oc_openshift_credentials 
 echo oc_dfe_deploy_url=$oc_dfe_deploy_url
 echo oc_nexus_repo=$oc_nexus_repo
 echo oc_project=$oc_project
+echo oc_app=$oc_app
 # Print build env vars
 echo BUILD_ARTIFACTSTAGINGDIRECTORY=$BUILD_ARTIFACTSTAGINGDIRECTORY
 echo BUILD_BINARIESDIRECTORY=$BUILD_BINARIESDIRECTORY
@@ -20,6 +22,8 @@ export oc_openshift_credentials
 export oc_dfe_deploy_url
 export oc_nexus_repo
 export oc_project
+export oc_app
 # Grab the script from the server that does the actual deploy
-echo curl -u $oc_nexus_credentials -ksSf $oc_dfe_deploy_url | sh
-curl -u $oc_nexus_credentials -ksSf $oc_dfe_deploy_url | sh
+#echo curl -u $oc_nexus_credentials -ksSf $oc_dfe_deploy_url | sh
+#curl -u $oc_nexus_credentials -ksSf $oc_dfe_deploy_url | sh
+./dotnet-20-runtime-rhel7.sh
diff --git a/dotnet-20-runtime-rhel7.sh b/dotnet-20-runtime-rhel7.sh
@@ -5,8 +5,7 @@ echo oc_openshift_credentials=$oc_openshift_credentials
 echo oc_dfe_deploy_url=$oc_dfe_deploy_url
 echo oc_nexus_repo=$oc_nexus_repo
 echo oc_project=$oc_project
-
-
+echo oc_app=$oc_app
 
 echo BUILD_ARTIFACTSTAGINGDIRECTORY=$BUILD_ARTIFACTSTAGINGDIRECTORY
 echo BUILD_BINARIESDIRECTORY=$BUILD_BINARIESDIRECTORY
@@ -28,8 +27,8 @@ echo ### ADDING Dockerfile TO $INNER_ZIP
 zip $INNER_ZIP Dockerfile
 mv $INNER_ZIP $BUILD_BUILDID.zip
 
-echo ### PUBLISHING $INNER_ZIP TO $oc_nexus_repo
-curl -k -v -u $oc_nexus_credentials --upload-file $BUILD_BUILDID.zip $oc_nexus_repo
+#echo ### PUBLISHING $INNER_ZIP TO $oc_nexus_repo
+#curl -k -v -u $oc_nexus_credentials --upload-file $BUILD_BUILDID.zip $oc_nexus_repo
 
 # Download oc
 curl -u $oc_nexus_credentials -O -k https://nexus.demo.dfe.secnix.co.uk/repository/dfe_admin/oc-3.6.173.0.49-linux.tar
@@ -40,4 +39,4 @@ echo ### LOGGING IN
 
 echo ### RUNNIGN BUILD appname IN $OC_PROJECT WITH $BUILD_BUILDID.zip
 ./oc project $OC_PROJECT
-./oc start-build appname -n $OC_PROJECT --from-archive=$BUILD_BUILDID.zip
+./oc start-build $oc_app -n $OC_PROJECT --from-archive=$BUILD_BUILDID.zip