Skip to content

Add kubevirt-builder as build base #8211

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 23, 2020
Merged

Add kubevirt-builder as build base #8211

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
33 changes: 28 additions & 5 deletions ci-operator/config/kubevirt/kubevirt/kubevirt-kubevirt-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,35 @@ base_images:
name: "4.4"
namespace: ocp
tag: base
kubevirt-builder:
cluster: https://api.ci.openshift.org
name: kubevirt-builder
namespace: ci
tag: 30-5.8.1

@davidvossel davidvossel Apr 17, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

where does this kubevirt-builder container come from? would it not make sense for us to build this build container from the upstream sources?

@dhiller dhiller Apr 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've added an image stream to import the kubevirt builder images from the docker registry: https://github.com/openshift/release/blob/7f2a4c4d470010cc9e05e1dc34f70b2e75b5b357/core-services/supplemental-ci-images/kubevirt_builder_is.yaml

@dhiller dhiller Apr 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

AFAIU there are technical reasons why this had to be done in a separate PR.

@dhiller dhiller Apr 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

And as you can see here it succeeds in using the image, but fails when trying to use the new script (contained in the related kubevirt PR)

@davidvossel davidvossel Apr 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ah, i see. makes sense then.

build_root:
image_stream_tag:
cluster: https://api.ci.openshift.org
name: release
namespace: openshift
tag: golang-1.12
name: kubevirt-builder
namespace: ci
tag: 30-5.8.1
canonical_go_repository: kubevirt.io/kubevirt
images:
- dockerfile_path: hack/ci/Dockerfile.ci
from: base
from: kubevirt-builder
inputs:
root:
as:
- builder
paths: null
to: kubevirt-test
- dockerfile_path: hack/ci/Dockerfile.ci-pr
from: kubevirt-builder
inputs:
root:
as:
- builder
paths: null
to: kubevirt-test-pr
resources:
'*':
limits:
Expand All @@ -33,7 +46,7 @@ tag_specification:
namespace: ocp
tests:
- artifact_dir: /go/src/kubevirt.io/kubevirt/_out/exported-artifacts
as: e2e
as: e2e-periodic-gcp-nested-virt
commands: |
cd /go/src/kubevirt.io/kubevirt
#./hack/ci/test.sh
Expand Down Expand Up @@ -70,3 +83,13 @@ tests:
from: pipeline:kubevirt-test
enable_nested_virt: true
nested_virt_image: rhcos43-nested-virt
- artifact_dir: /go/src/kubevirt.io/kubevirt/_out/exported-artifacts
as: e2e-gcp-nested-virt
commands: |
cd /go/src/kubevirt.io/kubevirt
bash -x ./hack/ci/test.sh
openshift_installer_custom_test_image:
cluster_profile: gcp
from: pipeline:kubevirt-test-pr
enable_nested_virt: true
nested_virt_image: rhcos43-nested-virt
14 changes: 7 additions & 7 deletions ci-operator/jobs/kubevirt/kubevirt/kubevirt-kubevirt-master-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ periodics:
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-kubevirt-kubevirt-master-e2e
name: periodic-ci-kubevirt-kubevirt-master-e2e-periodic-gcp-nested-virt
spec:
containers:
- args:
Expand All @@ -24,9 +24,9 @@ periodics:
- --lease-server-password-file=/etc/boskos/password
- --lease-server-username=ci
- --lease-server=https://boskos-ci.svc.ci.openshift.org
- --secret-dir=/usr/local/e2e-cluster-profile
- --target=e2e
- --template=/usr/local/e2e
- --secret-dir=/usr/local/e2e-periodic-gcp-nested-virt-cluster-profile
- --target=e2e-periodic-gcp-nested-virt
- --template=/usr/local/e2e-periodic-gcp-nested-virt
command:
- ci-operator
env:
Expand All @@ -37,7 +37,7 @@ periodics:
- name: CLUSTER_TYPE
value: gcp
- name: JOB_NAME_SAFE
value: e2e
value: e2e-periodic-gcp-nested-virt
- name: TEST_COMMAND
value: |
cd /go/src/kubevirt.io/kubevirt
Expand Down Expand Up @@ -84,9 +84,9 @@ periodics:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-cluster-profile
- mountPath: /usr/local/e2e-periodic-gcp-nested-virt-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e
- mountPath: /usr/local/e2e-periodic-gcp-nested-virt
name: job-definition
subPath: cluster-launch-installer-custom-test-image.yaml
- mountPath: /etc/pull-secret
Expand Down
94 changes: 94 additions & 0 deletions ci-operator/jobs/kubevirt/kubevirt/kubevirt-kubevirt-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,99 @@
presubmits:
kubevirt/kubevirt:
- agent: kubernetes
always_run: true
branches:
- master
cluster: api.ci
context: ci/prow/e2e-gcp-nested-virt
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-kubevirt-kubevirt-master-e2e-gcp-nested-virt
path_alias: kubevirt.io/kubevirt
rerun_command: /test e2e-gcp-nested-virt
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --kubeconfig=/etc/apici/kubeconfig
- --lease-server-password-file=/etc/boskos/password
- --lease-server-username=ci
- --lease-server=https://boskos-ci.svc.ci.openshift.org
- --secret-dir=/usr/local/e2e-gcp-nested-virt-cluster-profile
- --target=e2e-gcp-nested-virt
- --template=/usr/local/e2e-gcp-nested-virt
command:
- ci-operator
env:
- name: CLUSTER_ENABLE_NESTED_VIRT
value: "true"
- name: CLUSTER_NESTED_VIRT_IMAGE
value: rhcos43-nested-virt
- name: CLUSTER_TYPE
value: gcp
- name: JOB_NAME_SAFE
value: e2e-gcp-nested-virt
- name: TEST_COMMAND
value: |
cd /go/src/kubevirt.io/kubevirt
bash -x ./hack/ci/test.sh
- name: TEST_IMAGESTREAM_TAG
value: pipeline:kubevirt-test-pr
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/apici
name: apici-ci-operator-credentials
readOnly: true
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-gcp-nested-virt-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-gcp-nested-virt
name: job-definition
subPath: cluster-launch-installer-custom-test-image.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: apici-ci-operator-credentials
secret:
items:
- key: sa.ci-operator.apici.config
path: kubeconfig
secretName: apici-ci-operator-credentials
- name: boskos
secret:
items:
- key: password
path: password
secretName: boskos-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-gcp
- configMap:
name: cluster-profile-gcp
- configMap:
name: prow-job-cluster-launch-installer-custom-test-image
name: job-definition
- name: pull-secret
secret:
secretName: regcred
trigger: (?m)^/test( | .* )e2e-gcp-nested-virt,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down