From 654e73d3876f5af10cfc1c054b89fa958192844d Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 17 May 2018 13:43:10 -0400 Subject: [PATCH] Set up artifact reporting for ci-operator jobs --- cluster/ci/config/prow/config.yaml | 9 ++++----- cluster/ci/config/prow/openshift/ci-operator/build.yaml | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cluster/ci/config/prow/config.yaml b/cluster/ci/config/prow/config.yaml index 67cb2c01c36d5..9fee54cb60d1c 100644 --- a/cluster/ci/config/prow/config.yaml +++ b/cluster/ci/config/prow/config.yaml @@ -4,7 +4,6 @@ plank: default_decoration_config: timeout: 7200000000000 # 2h grace_period: 15000000000 # 15s - artifact_dir: /tmp/artifacts utility_images: clonerefs: "registry.svc.ci.openshift.org/ci/clonerefs:latest-json" initupload: "registry.svc.ci.openshift.org/ci/initupload:latest-json" @@ -1025,7 +1024,7 @@ presubmits: serviceAccountName: ci-operator containers: - name: test - image: docker-registry.default.svc:5000/ci/ci-operator:latest + image: ci-operator:latest env: - name: CONFIG_SPEC valueFrom: @@ -1036,7 +1035,7 @@ presubmits: - ci-operator args: - --delete-when-idle=10m - - --artifact-dir=/tmp/artifacts + - --artifact-dir=$(ARTIFACTS) - --dry-run=false - --target=unit - name: pull-ci-image-registry-e2e @@ -1063,7 +1062,7 @@ presubmits: name: cluster-profile-gcp containers: - name: test - image: docker-registry.default.svc:5000/ci/ci-operator:latest + image: ci-operator:latest volumeMounts: - name: job-definition mountPath: /usr/local/e2e-gcp @@ -1093,7 +1092,7 @@ presubmits: export RPM_REPO="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)" ci-operator \ --delete-when-idle=10m --dry-run=false \ - --artifact-dir=/tmp/artifacts \ + --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/openshift/ci-operator/build.yaml b/cluster/ci/config/prow/openshift/ci-operator/build.yaml index 551ea62759346..40b37fec259aa 100644 --- a/cluster/ci/config/prow/openshift/ci-operator/build.yaml +++ b/cluster/ci/config/prow/openshift/ci-operator/build.yaml @@ -40,4 +40,7 @@ items: kind: ImageStream metadata: name: ci-operator - namespace: ci \ No newline at end of file + namespace: ci + spec: + lookupPolicy: + local: true \ No newline at end of file