diff --git a/deployment/config.yaml b/deployment/config.yaml index 3b165c9..189c629 100644 --- a/deployment/config.yaml +++ b/deployment/config.yaml @@ -1,3 +1,11 @@ +prev: + deployment: + frontend: + templates: + - manifest: deployment/manifests/app.yaml + parameters: + ENV: prev + REPLICAS: 1 dev: deployment: frontend: diff --git a/deployment/preview-pipeline.groovy b/deployment/preview-pipeline.groovy new file mode 100644 index 0000000..7362c60 --- /dev/null +++ b/deployment/preview-pipeline.groovy @@ -0,0 +1,8 @@ +@Library('occd') _ + +node() { + stage("Deploy to PREV") { + occd.tag("rubex-dev", "frontend", "${SOURCE_IMAGE_STREAM_TAG}", "prev") + occd.rollout("rubex-prev", "frontend", config.prev.deployment.frontend) + } +} diff --git a/infra/setup.sh b/infra/setup.sh index 6582722..5e76e14 100644 --- a/infra/setup.sh +++ b/infra/setup.sh @@ -16,9 +16,9 @@ oc create is oc-jenkins oc tag --source=docker --scheduled=true omallo/oc-jenkins:latest openshift/oc-jenkins:latest oc login -u admin -p admin -oc new-project cicd -oc policy add-role-to-user edit system:serviceaccount:cicd:jenkins -n rubex-dev -oc policy add-role-to-user edit system:serviceaccount:cicd:jenkins -n rubex-test +oc new-project rubex-prev +oc policy add-role-to-user edit dev1 -n rubex-prev +oc policy add-role-to-user view test1 -n rubex-prev oc login -u admin -p admin oc new-project rubex-dev @@ -28,8 +28,15 @@ oc policy add-role-to-user view test1 -n rubex-dev oc login -u admin -p admin oc new-project rubex-test oc policy add-role-to-user edit test1 -n rubex-test +oc policy add-role-to-group system:image-puller system:serviceaccounts:rubex-prev -n rubex-dev oc policy add-role-to-group system:image-puller system:serviceaccounts:rubex-test -n rubex-dev +oc login -u admin -p admin +oc new-project cicd +oc policy add-role-to-user edit system:serviceaccount:cicd:jenkins -n rubex-prev +oc policy add-role-to-user edit system:serviceaccount:cicd:jenkins -n rubex-dev +oc policy add-role-to-user edit system:serviceaccount:cicd:jenkins -n rubex-test + oc login -u admin -p admin oc project cicd oc process \