Create Jenkins image with ci-release

Author: csrwng

tools/build/ci-jenkins-image/Dockerfile

@@ -0,0 +1,2 @@
+FROM jenkins
+COPY bin/release-ci /usr/bin/release-ci

tools/build/config/build-release-ci.yaml

@@ -106,3 +106,35 @@ objects:
           kind: ImageStreamTag
           name: slave-base:latest
       type: Docker
+- apiVersion: v1
+  kind: BuildConfig
+  metadata:
+    labels:
+      build: ci-jenkins
+    name: ci-jenkins
+  spec:
+    output:
+      to:
+        kind: ImageStreamTag
+        name: release-ci:jenkins
+    source:
+      git:
+        ref: ${RELEASE_REF}
+        uri: ${RELEASE_URL}
+      images:
+      - from:
+          name: release-ci:binary
+          kind: ImageStreamTag
+        paths:
+        - sourcePath: /usr/bin/release-ci
+          destinationDir: tools/build/ci-jenkins-image/bin
+      contextDir: tools/build/ci-jenkins-image
+      type: Git
+    strategy:
+      dockerStrategy:
+        noCache: true
+        from:
+          kind: ImageStreamTag
+          name: jenkins:latest
+          namespace: openshift
+      type: Docker

tools/build/pipeline/Jenkinsfile

@@ -35,7 +35,26 @@ pipeline {
         stage("Build Slave") {
             steps {
                 waitForTag(this, "slave-base", "latest")
-                runBuild(this, "release-ci-slave")
+                script {
+                    try { 
+                        runBuild(this, "release-ci-slave")
+                    } catch(e) {
+                        echo "Retrying slave image build"
+                        runBuild(this, "release-ci-slave")
+                    }
+                }
+            }
+        }
+        stage ("Build Jenkins") {
+            steps {
+                script {
+                    try {
+                        runBuild(this, "ci-jenkins")
+                    } catch(e) {
+                        echo "Retrying ci-jenkins image build"
+                        runBuild(this, "ci-jenkins")
+                    }
+                }
             }
         }
         stage("Annotate Slave Tag") {