From 1a545b425abcb14bbc6711fd6f1dd74ec6c91015 Mon Sep 17 00:00:00 2001 From: Ovidio Mallo Date: Mon, 2 Jan 2017 18:40:24 +0100 Subject: [PATCH] Use a persistent storage for jenkins --- infra/setup.sh | 12 ++++++++++-- infra/{volumes.yaml => volumes-gce.yaml} | 0 infra/volumes-local.yaml | 13 +++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) rename infra/{volumes.yaml => volumes-gce.yaml} (100%) create mode 100644 infra/volumes-local.yaml diff --git a/infra/setup.sh b/infra/setup.sh index be06e8b..a7832f5 100644 --- a/infra/setup.sh +++ b/infra/setup.sh @@ -3,6 +3,11 @@ sudo htpasswd -b /etc/origin/master/htpasswd dev1 dev1 sudo htpasswd -b /etc/origin/master/htpasswd test1 test1 +oc login -u system:admin +mkdir -p ~/openshift/volumes/ +oc delete -f infra/volumes-local.yaml +oc apply -f infra/volumes-local.yaml + oc login -u system:admin oc project openshift oc delete is oc-jenkins @@ -24,10 +29,13 @@ 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-test -n rubex-dev +oc login -u admin -p admin +oc project cicd oc process \ - -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-ephemeral-template.json \ - -v MEMORY_LIMIT=2Gi \ + -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-persistent-template.json \ -v JENKINS_IMAGE_STREAM_TAG=oc-jenkins:latest \ + -v MEMORY_LIMIT=2Gi \ + -v VOLUME_CAPACITY=5Gi \ | oc apply -f - # --- diff --git a/infra/volumes.yaml b/infra/volumes-gce.yaml similarity index 100% rename from infra/volumes.yaml rename to infra/volumes-gce.yaml diff --git a/infra/volumes-local.yaml b/infra/volumes-local.yaml new file mode 100644 index 0000000..5d283da --- /dev/null +++ b/infra/volumes-local.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: disk-1 +spec: + capacity: + storage: 10Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + hostPath: + path: /Users/omallo/openshift/volumes/disk-1