Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci-operator/config/openshift/installer/master: Move to openshift-install #1677

Merged
merged 1 commit into from
Sep 27, 2018
Merged

ci-operator/config/openshift/installer/master: Move to openshift-install #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 2 additions & 35 deletions ci-operator/config/openshift/installer/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,15 @@ base_images:
name: origin-v4.0
namespace: openshift
tag: base
base-smoke:
cluster: https://api.ci.openshift.org
namespace: openshift
name: release
tag: bazel
binary_build_commands: go build ./installer/cmd/tectonic
canonical_go_repository: github.com/openshift/installer
images:
- dockerfile_path: images/tectonic-installer/Dockerfile.ci
- dockerfile_path: images/installer/Dockerfile.ci
from: base
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/installer/tectonic
root:
as:
- build
to: installer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the replacement dockerfile centos based and using the right tooling?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the replacement dockerfile centos based and using the right tooling?

There is no replacement Dockerfile. openshift/release:golang-1.10 has what we need for hack/build.sh && hack/get-terraform.sh, and I was hoping to build the :installer image with just that here. But I don't know what I'm doing with ci-operator; maybe that's not how it works?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no replacement Dockerfile.

This was a dead end. I've pushed a replacement Dockerfile with openshift/installer#343, but it's based on scratch, not CentOS. Do we need CentOS for something?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ART team recommends this, may be outright required, I'm not sure. (https://mojo.redhat.com/docs/DOC-1179058#jive_content_id_Images)

I also quickly noticed I can't exec in with /bin/bash, which is awfully handy for debugging. Actually in the way we're probably going to use this in Hive we probably need a more substantial base layer.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also quickly noticed I can't exec in with /bin/bash, which is awfully handy for debugging.

The Dockerfile is stuffing the binaries into scratch (for folks who just need the binaries), but I couldn't figure out the right phrasing for that here (lucky for you ;), so we're currently using the base image (defined here) as the base layer that gets the binaries added. I chat about this a bit in the 3f2f01c commit message if you want more details.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah so your published CI output is quite different from your scratch Dockerfile.ci if you built it yourself? As long as the published image is CentOS/RHEL based I think we'll have what we need.

You could also consider multiple Dockerfiles if need be. I can hack my own for now until this is getting publishing.

- dockerfile_path: images/tectonic-installer/Dockerfile.ci
optional: true
from: base-smoke
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/installer/tectonic
root:
as:
- build
to: installer-bazel
- dockerfile_path: images/installer-origin-release/Dockerfile.ci
optional: true
from: installer-bazel
to: installer-smoke
resources:
'*':
limits:
Expand All @@ -47,13 +21,6 @@ resources:
requests:
cpu: 100m
memory: 200Mi
bin:
limits:
cpu: '7'
memory: 9Gi
requests:
cpu: '3'
memory: 7Gi
unit:
limits:
cpu: '7'
Expand All @@ -75,7 +42,7 @@ build_root:
tag: golang-1.10
tests:
- as: unit
commands: go test ./pkg/... ./installer/pkg/...
commands: go test ./pkg/...
from: src
- as: gofmt
commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .
Expand Down
58 changes: 0 additions & 58 deletions ci-operator/config/openshift/installer/release-3.11.yaml
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
presubmits:
openshift/installer:
- agent: kubernetes
always_run: true
context: ci/prow/build-tarball
decorate: true
name: pull-ci-openshift-installer-bazel-build-tarball
rerun_command: /test build-tarball
spec:
containers:
- args:
- ./hack/test-bazel-build-tarball.sh
- --action_env=HOME=/tmp
command:
- sh
env:
- name: HOME
value: /tmp
- name: IS_CONTAINER
value: "TRUE"
- name: USER
value: bazel
image: quay.io/coreos/tectonic-builder:bazel-v0.3
imagePullPolicy: Always
name: ""
resources: {}
trigger: (?m)^/test build-tarball
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -145,63 +120,6 @@ presubmits:
- configMap:
name: cluster-profile-aws
trigger: ((?m)^/test( e2e-aws-all),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-aws-smoke
decorate: true
name: pull-ci-openshift-installer-master-e2e-aws-smoke
rerun_command: /test e2e-aws-smoke
run_if_changed: ^([^D]|D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*([^Do]|o[^Dc]|oc[^Du]|ocu[^Dm]|ocum([^De]|e([^Dn]|n([^Dt]|t([^Da]|a[^Dt]|at[^Di]|ati[^Do]|atio[^Dn]))))))*(D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*(o|oc|ocu|ocum(e(n(t(a|at|ati|atio)?)?)?)?)?)?$
skip_cloning: true
spec:
containers:
- command:
- ci-operator
- --give-pr-author-access-to-namespace=true
- --artifact-dir=$(ARTIFACTS)
- --secret-dir=/usr/local/e2e-aws-smoke-cluster-profile
- --template=/usr/local/e2e-aws-smoke
- --target=e2e-aws-smoke
- --give-pr-author-access-to-namespace
env:
- name: JOB_NAME_SAFE
value: e2e-aws-smoke
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: master.yaml
name: ci-operator-openshift-installer
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
limits:
cpu: 500m
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-smoke
name: job-definition
subPath: cluster-launch-installer-e2e-smoke.yaml
- mountPath: /usr/local/e2e-aws-smoke-cluster-profile
name: cluster-profile
serviceAccountName: ci-operator
volumes:
- configMap:
name: prow-job-cluster-launch-installer-e2e-smoke
name: job-definition
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws
trigger: ((?m)^/test( all| e2e-aws-smoke),?(\s+|$))
- agent: kubernetes
always_run: true
branches:
Expand Down
Loading