From 71d60305c17200132686405bf3e58a36fea4cd0a Mon Sep 17 00:00:00 2001 From: Siamak Date: Tue, 5 Mar 2019 14:18:30 +0100 Subject: [PATCH] adding ocp 4.0 (wip) --- README.md | 4 ++-- cicd-template.yaml | 2 +- scripts/provision.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 28805a1a..2855a3ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -*For other versions of OpenShift, follow the instructions in the corresponding branch e.g. ocp-3.11, ocp-3.10, etc +*For other versions of OpenShift, follow the instructions in the corresponding branch e.g. ocp-4.0, ocp-3.11, , etc -# CI/CD Demo - OpenShift Container Platform 3.11 +# CI/CD Demo - OpenShift Container Platform 4.0 This repository includes the infrastructure and pipeline definition for continuous delivery using Jenkins, Nexus, SonarQube and Eclipse Che on OpenShift. diff --git a/cicd-template.yaml b/cicd-template.yaml index ef0f83be..00814bd9 100644 --- a/cicd-template.yaml +++ b/cicd-template.yaml @@ -424,7 +424,7 @@ objects: cat /tmp/curl.log exit 255 fi - image: openshift/origin:v3.11 + image: quay.io/openshift/origin-cli:v4.0 name: cicd-demo-installer-job resources: {} terminationMessagePath: /dev/termination-log diff --git a/scripts/provision.sh b/scripts/provision.sh index b6649a77..b3bd71a7 100755 --- a/scripts/provision.sh +++ b/scripts/provision.sh @@ -143,7 +143,7 @@ LOGGEDIN_USER=$(oc $ARG_OC_OPS whoami) OPENSHIFT_USER=${ARG_USERNAME:-$LOGGEDIN_USER} PRJ_SUFFIX=${ARG_PROJECT_SUFFIX:-`echo $OPENSHIFT_USER | sed -e 's/[-@].*//g'`} GITHUB_ACCOUNT=${GITHUB_ACCOUNT:-siamaksade} -GITHUB_REF=${GITHUB_REF:-ocp-3.11} +GITHUB_REF=${GITHUB_REF:-ocp-4.0} function deploy() { oc $ARG_OC_OPS new-project dev-$PRJ_SUFFIX --display-name="Tasks - Dev"