Merge pull request #1184 from gabemontero/jenkins-e2e-3.10

add 3.10 config for jenkins e2e testing
openshift · Aug 15, 2018 · 692faad · 692faad
2 parents 0a04c4d + 6dddee4
commit 692faad
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 1 deletion.
diff --git a/ci-operator/config/openshift/jenkins/openshift-3.10.json b/ci-operator/config/openshift/jenkins/openshift-3.10.json
@@ -0,0 +1,123 @@
+{
+    "tag_specification": {
+        "cluster": "https://api.ci.openshift.org",
+        "namespace": "openshift",
+        "name": "origin-v3.10",
+        "tag": "",
+        "tag_overrides": {}
+    },
+    "base_images": {
+        "base": {
+            "cluster": "https://api.ci.openshift.org",
+            "namespace": "openshift",
+            "name": "origin-v3.10",
+            "tag": "cli"
+        },
+        "cluster-tests": {
+            "cluster": "https://api.ci.openshift.org",
+            "namespace": "openshift",
+            "name": "origin-v3.10",
+            "tag": "tests"
+        }
+    },
+    "test_base_image": {
+        "cluster": "https://api.ci.openshift.org",
+        "namespace": "openshift",
+        "name": "release",
+        "tag": "golang-1.9"
+    },
+    "images": [
+        {
+            "from": "cluster-tests",
+            "to": "jenkins-e2e-tests",
+            "optional": true,
+            "inputs": {"src": {"paths": [{"source_path": "/go/src/github.com/openshift/jenkins/test-e2e/.","destination_dir": "."}]}}
+        },
+        {
+            "from": "base",
+            "to": "bin-2-centos",
+            "optional": true,
+            "dockerfile_path": "Dockerfile",
+            "inputs": {"src": {"paths": [{"source_path": "/go/src/github.com/openshift/jenkins/2/.","destination_dir": "."}]}}
+        },
+        {
+            "from": "base",
+            "to": "bin-slave-base-centos",
+            "optional": true,
+            "dockerfile_path": "Dockerfile",
+            "inputs": {"src": {"paths": [{"source_path": "/go/src/github.com/openshift/jenkins/slave-base/.","destination_dir": "."}]}}
+        },
+        {
+            "from": "bin-slave-base-centos",
+            "to": "bin-agent-maven-35-centos",
+            "optional": true,
+            "dockerfile_path": "Dockerfile",
+            "inputs": {"src": {"paths": [{"source_path": "/go/src/github.com/openshift/jenkins/agent-maven-3.5/.","destination_dir": "."}]}}
+        },
+        {
+            "from": "bin-slave-base-centos",
+            "to": "bin-agent-nodejs-8-centos",
+            "optional": true,
+            "dockerfile_path": "Dockerfile",
+            "inputs": {"src": {"paths": [{"source_path": "/go/src/github.com/openshift/jenkins/agent-nodejs-8/.","destination_dir": "."}]}}
+        }
+    ],
+    "raw_steps": [
+        {
+            "output_image_tag_step": {
+                "from": "bin-2-centos",
+                "to": {
+                    "name": "stable",
+                    "tag": "prepare",
+                    "as": "prepare"
+                },
+                "optional": true
+            }
+        },
+        {
+            "output_image_tag_step": {
+                "from": "bin-agent-maven-35-centos",
+                "to": {
+                    "name": "stable",
+                    "tag": "maven_agent",
+                    "as": "maven_agent"
+                },
+                "optional": true
+            }
+        },
+        {
+            "output_image_tag_step": {
+                "from": "bin-agent-nodejs-8-centos",
+                "to": {
+                    "name": "stable",
+                    "tag": "nodejs_agent",
+                    "as": "nodejs_agent"
+                },
+                "optional": true
+            }
+        },
+        {
+            "output_image_tag_step": {
+                "from": "jenkins-e2e-tests",
+                "to": {
+                    "name": "stable",
+                    "tag": "tests",
+                    "as": "tests"
+                },
+                "optional": true
+            }
+        }
+    ],
+    "resources": {
+        "*": {
+            "requests": {
+                "cpu": "100m",
+                "memory": "200Mi"
+            },
+            "limits": {
+                "cpu": "2",
+                "memory": "4Gi"
+            }
+        }
+    }
+}
diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-presubmits.yaml
@@ -65,7 +65,70 @@ presubmits:
           set -e
           export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)"
           ci-operator \
+            --give-pr-author-access-to-namespace=true \
             --delete-when-idle=10m --dry-run=false \
             --artifact-dir=$(ARTIFACTS) \
             --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \
-            --target=e2e-gcp
+            --target=e2e-gcp
+  - name: pull-ci-jenkins-e2e-3.10-canary
+    agent: kubernetes
+    context: ci/prow/e2e
+    branches:
+    - openshift-3.10
+    rerun_command: "/test e2e"
+    always_run: false
+    trigger: "((?m)^/test( all| e2e),?(\\s+|$))"
+    decorate: true
+    spec:
+      serviceAccountName: ci-operator
+      volumes:
+      - name: job-definition
+        configMap:
+          name: prow-job-cluster-launch-e2e-gmontero-testing
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
+      containers:
+      - name: test
+        image: ci-operator:latest
+        volumeMounts:
+        - name: job-definition
+          mountPath: /usr/local/e2e-gcp
+          subPath: cluster-launch-e2e-gmontero-testing.yaml
+        - name: cluster-profile
+          mountPath: /usr/local/e2e-gcp-cluster-profile
+        env:
+        - name: PREPARE_COMMAND
+          value: tag-in-image.sh
+        - name: TEST_FOCUS
+          value: openshift pipieline
+        - name: TEST_FOCUS_SERIAL
+          value: openshift pipeline
+        - name: JOB_NAME_SAFE
+          value: e2e-gcp
+        - name: CLUSTER_TYPE
+          value: gcp
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              name: ci-operator-openshift-jenkins-canary
+              key: openshift-3.10.json
+        - name: RPM_REPO_BASEURL_REF
+          value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms
+        command:
+        - /bin/bash
+        - -c
+        - |
+          #!/bin/bash
+          set -e
+          export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)"
+          ci-operator \
+            --give-pr-author-access-to-namespace=true \
+            --delete-when-idle=10m --dry-run=false \
+            --artifact-dir=$(ARTIFACTS) \
+            --secret-dir=/usr/local/e2e-gcp-cluster-profile --template=/usr/local/e2e-gcp \
+            --target=e2e-gcp            
diff --git a/cluster/ci/config/prow/plugins.yaml b/cluster/ci/config/prow/plugins.yaml
@@ -92,6 +92,8 @@ config_updater:
       name: ci-operator-openshift-service-serving-cert-signer
     ci-operator/config/openshift/jenkins/master.json:
       name: ci-operator-openshift-jenkins-canary
+    ci-operator/config/openshift/jenkins/openshift-3.10.json:
+      name: ci-operator-openshift-jenkins-canary
     ci-operator/config/openshift/origin-aggregated-logging/master.json:
       name: ci-operator-openshift-origin-aggregated-logging
     ci-operator/config/openshift/origin-metrics/master.json: