Skip to content

Add periodic job for OCP with realtime workers #7154

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 4 commits into from
Mar 16, 2020
Merged

Add periodic job for OCP with realtime workers #7154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c7cc0c
Added periodic job for OCP 4.4 with realtime workers
slintes Feb 13, 2020
46000a3
Added periodic jobs for OCP 4.5 and 4.6, added all to release configs
slintes Feb 13, 2020
d83c779
Apply config changes after rebase
slintes Mar 9, 2020
05e0471
separated CLUSTER_NETWORK_MANIFEST and rt variant flows
slintes Mar 16, 2020
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
115 changes: 115 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,121 @@ periodics:
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
labels:
ci.openshift.io/release-type: informing
job-release: "4.4"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: release-openshift-ocp-installer-e2e-gcp-rt-4.4
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --input-hash=$(BUILD_ID)
- --input-hash=$(JOB_NAME)
- --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-rt-cluster-profile
- --secret-dir=/usr/local/pull-secret
- --target=e2e-gcp
- --template=/usr/local/e2e-gcp
command:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/ocp/release:4.4
- name: BRANCH
value: "4.4"
- name: CLUSTER_TYPE
value: gcp
- name: CLUSTER_VARIANT
value: rt
- name: CONFIG_SPEC
value: |
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tag_specification:
cluster: https://api.ci.openshift.org
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)-rt
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: JOB_NAME_SAFE
value: e2e-gcp-rt
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
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-rt-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-gcp
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /usr/local/pull-secret
name: release-pull-secret
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: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: pull-secret
secret:
secretName: regcred
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
Expand Down
115 changes: 115 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,121 @@ periodics:
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
labels:
ci.openshift.io/release-type: informing
job-release: "4.5"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: release-openshift-ocp-installer-e2e-gcp-rt-4.5
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --input-hash=$(BUILD_ID)
- --input-hash=$(JOB_NAME)
- --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-rt-cluster-profile
- --secret-dir=/usr/local/pull-secret
- --target=e2e-gcp
- --template=/usr/local/e2e-gcp
command:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/ocp/release:4.5
- name: BRANCH
value: "4.5"
- name: CLUSTER_TYPE
value: gcp
- name: CLUSTER_VARIANT
value: rt
- name: CONFIG_SPEC
value: |
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tag_specification:
cluster: https://api.ci.openshift.org
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)-rt
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: JOB_NAME_SAFE
value: e2e-gcp-rt
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
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-rt-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-gcp
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /usr/local/pull-secret
name: release-pull-secret
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: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: pull-secret
secret:
secretName: regcred
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
Expand Down
115 changes: 115 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,121 @@ periodics:
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
labels:
ci.openshift.io/release-type: informing
job-release: "4.6"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: release-openshift-ocp-installer-e2e-gcp-rt-4.6
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --input-hash=$(BUILD_ID)
- --input-hash=$(JOB_NAME)
- --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-rt-cluster-profile
- --secret-dir=/usr/local/pull-secret
- --target=e2e-gcp
- --template=/usr/local/e2e-gcp
command:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/ocp/release:4.6
- name: BRANCH
value: "4.6"
- name: CLUSTER_TYPE
value: gcp
- name: CLUSTER_VARIANT
value: rt
- name: CONFIG_SPEC
value: |
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tag_specification:
cluster: https://api.ci.openshift.org
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)-rt
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: JOB_NAME_SAFE
value: e2e-gcp-rt
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
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-rt-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-gcp
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /usr/local/pull-secret
name: release-pull-secret
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: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: pull-secret
secret:
secretName: regcred
- name: release-pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
Expand Down
18 changes: 18 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,24 @@ objects:
echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
fi

Copy link
Copy Markdown
Contributor

@jstuever jstuever Feb 26, 2020

Choose a reason for hiding this comment

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

nit: this should probably be flattened out:

if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]] || has_variant "rt"; then
    openshift-install --dir=/tmp/artifacts/installer/ create manifests
fi
if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
    echo ...
fi
if has_variant "rt"; then
    cat > ...
fi

or at least untangled:

if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
    openshift-install...
    echo ...
fi
if has_variant "rt"; then
    openshift-install...
    cat >...
fi

Copy link
Copy Markdown
Member Author

@slintes slintes Feb 27, 2020

Choose a reason for hiding this comment

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

Thanks for your review!

About your 1st suggestion: not sure, doesn't it make more sense to deal with both features which need to modify manifests inside the if branch which creates them?

About the 2nd: that might probably break if both features are used simultaneously, it would call create manifests twice.

Copy link
Copy Markdown
Contributor

@smarterclayton smarterclayton Mar 16, 2020

Choose a reason for hiding this comment

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

Yes, keep the variant separate. CLUSTER_NETWORK_MANIFEST is a highly specialized use case and support is limited.

Copy link
Copy Markdown
Contributor

@smarterclayton smarterclayton Mar 16, 2020

Choose a reason for hiding this comment

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

split them, and then insight has_variant "rt" have an error condition that fails if CLUSTER_NETWORK_MANIFEST is set:

if has_variant "rt"; then
  if [[ -n "{CLUSTER_NETWORK_MANIFEST:-}" ]]; then
    echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the `rt` variant'
    exit 1
  fi

Copy link
Copy Markdown
Member Author

@slintes slintes Mar 16, 2020

Choose a reason for hiding this comment

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

ok, done

if has_variant "rt"; then
if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the `rt` variant'
exit 1
fi
openshift-install --dir=/tmp/artifacts/installer/ create manifests
cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
labels:
machineconfiguration.openshift.io/role: worker
name: realtime-worker
spec:
kernelType: realtime
EOF
fi

TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster 2>&1 | grep --line-buffered -v password &
wait "$!"

Expand Down
Loading