From 235068080679680264a71fb5f20deb6e4bd815e3 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 27 May 2018 14:13:55 -0400 Subject: [PATCH] Add basic origin ci-operator definition --- Makefile | 7 +++- projects/origin/config.json | 56 +++++++++++++++++++++++++++ projects/origin/src-cache-origin.yaml | 30 ++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 projects/origin/config.json create mode 100644 projects/origin/src-cache-origin.yaml diff --git a/Makefile b/Makefile index 469a48c30d11..059fe6aec4af 100644 --- a/Makefile +++ b/Makefile @@ -160,9 +160,14 @@ prow-jobs: prow-cluster-jobs prow-rpm-mirrors $(MAKE) applyTemplate WHAT=projects/acs-engine/build.yaml .PHONY: prow-jobs -projects: gcsweb kube-state-metrics oauth-proxy origin-stable origin-release prometheus test-bases image-pruner-setup autoscaler descheduler node-problem-detector publishing-bot cluster-capacity content-mirror image-registry service-idler +projects: gcsweb kube-state-metrics oauth-proxy origin origin-stable origin-release prometheus test-bases image-pruner-setup autoscaler descheduler node-problem-detector publishing-bot cluster-capacity content-mirror image-registry service-idler .PHONY: projects +origin: + oc create configmap ci-operator-origin --from-file=projects/origin/config.json -o yaml --dry-run | oc apply -f - + $(MAKE) apply WHAT=projects/origin/src-cache-origin.yaml +.PHONY: origin + image-registry: oc create configmap ci-operator-image-registry --from-file=projects/image-registry/config.json -o yaml --dry-run | oc apply -f - .PHONY: image-registry diff --git a/projects/origin/config.json b/projects/origin/config.json new file mode 100644 index 000000000000..c5faac1faa43 --- /dev/null +++ b/projects/origin/config.json @@ -0,0 +1,56 @@ +{ + "tag_specification": { + "namespace": "openshift", + "name": "origin-v3.10", + "tag": "", + "tag_overrides": {} + }, + "base_rpm_images": [ + { + "namespace": "openshift", + "name": "origin-v3.10", + "tag": "base", + "as": "base" + } + ], + "test_base_image": { + "namespace": "ci", + "name": "src-cache-origin", + "tag": "master" + }, + + "binary_build_commands": "make build", + "rpm_build_commands": "make build-rpms", + + "images": [ + { + "from": "base", + "to": "cli", + "context_dir": "images/cli/" + }, + { + "from": "base", + "to": "hypershift", + "context_dir": "images/hypershift/" + }, + { + "from": "base", + "to": "hyperkube", + "context_dir": "images/hyperkube/" + }, + { + "from": "cli", + "to": "control-plane", + "context_dir": "images/origin/" + } + ], + + "tests": [ + { + "as": "unit", + "from": "src", + "commands": "ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 hack/test-go.sh", + "artifact_dir": "/tmp/artifacts" + } + ] +} \ No newline at end of file diff --git a/projects/origin/src-cache-origin.yaml b/projects/origin/src-cache-origin.yaml new file mode 100644 index 000000000000..dd7561190c3c --- /dev/null +++ b/projects/origin/src-cache-origin.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: List +items: +- kind: ImageStream + apiVersion: v1 + metadata: + name: src-cache-origin +- kind: BuildConfig + apiVersion: v1 + metadata: + name: src-cache-origin-master + spec: + successfulBuildsHistoryLimit: 1 + failedBuildsHistoryLimit: 2 + output: + to: + kind: ImageStreamTag + name: src-cache-origin:master + source: + dockerfile: | + FROM openshift/origin-release:golang-1.9 + WORKDIR /go/src/github.com/openshift/origin + RUN umask 0002 && chmod -R uga+rwx . && \ + git clone -b master --single-branch https://github.com/openshift/origin.git . + strategy: + dockerStrategy: + from: + kind: ImageStreamTag + name: release-with-clonerefs:golang-1.9 + imageOptimizationPolicy: SkipLayers