summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-10-12 15:12:18 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-10-12 15:12:18 +0200
commit6fcefb3827afd8c7a92d9fac2251f44cd270ce09 (patch)
tree05271fac5c7d435866621c79c05b64dc63c988cd
parent78d2d6a306567c988341eabd3e26674bd18381ef (diff)
downloadgitlab-ce-6fcefb3827afd8c7a92d9fac2251f44cd270ce09.tar.gz
Improve vendored OpenShift script
-rw-r--r--vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
index b8743a9eae3..fccd20ed59e 100644
--- a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
@@ -7,8 +7,8 @@ stages:
- production
variables:
- OPENSHIFT_SERVER: https://origin.gitlap.com:8443
- OPENSHIFT_DOMAIN: apps.tanukionline.com
+ OPENSHIFT_SERVER: https://openshift.example.com:8443
+ OPENSHIFT_DOMAIN: apps.example.com
# Configure this variable in Secure Variables:
# OPENSHIFT_TOKEN: my.openshift.token
@@ -37,8 +37,8 @@ test2:
- oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify
- oc project "$CI_PROJECT_NAME" || oc new-project "$CI_PROJECT_NAME"
script:
- - "! oc get services $APP || oc start-build $APP --from-dir=. --wait"
- "oc get services $APP || oc new-app . --name=$APP --strategy=docker"
+ - "oc start-build $APP --from-dir=. --follow"
- "oc get routes $APP || oc expose service $APP --hostname=$APP_HOST"
production: