Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,10 @@ tests:
steps:
cluster_profile: kubevirt
workflow: openshift-e2e-kubevirt
- as: e2e-aws-single-node
steps:
cluster_profile: aws
workflow: openshift-e2e-aws-single-node
zz_generated_metadata:
branch: master
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ presubmits:
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-master-e2e-aws-single-node
optional: true
Expand All @@ -531,18 +532,8 @@ presubmits:
- --report-username=ci
- --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile
- --target=e2e-aws-single-node
- --template=/usr/local/e2e-aws-single-node
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: single-node
- name: JOB_NAME_SAFE
value: e2e-aws-single-node
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
Expand All @@ -558,9 +549,6 @@ presubmits:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /usr/local/e2e-aws-single-node
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
Expand All @@ -580,9 +568,6 @@ presubmits:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: pull-secret
secret:
secretName: registry-pull-credentials
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
approvers:
- romfreiman
- eranco74
- tsorya
- osherdp
- yuvigold
- omertuc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"path": "openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml",
"owners": {
"approvers": [
"romfreiman",
"eranco74",
"tsorya",
"osherdp",
"yuvigold",
"omertuc"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
workflow:
as: openshift-e2e-aws-single-node
steps:
pre:
- chain: ipi-conf-aws
- ref: single-node-conf
- chain: ipi-install
test:
- ref: openshift-e2e-test
post:
- chain: gather-network
- chain: gather-core-dump
- chain: ipi-deprovision
documentation: |-
The Openshift E2E Single Node workflow executes the common end-to-end test suite with the a single node cluster.
7 changes: 7 additions & 0 deletions ci-operator/step-registry/single-node/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
approvers:
- romfreiman
- eranco74
- tsorya
- osherdp
- yuvigold
- omertuc
7 changes: 7 additions & 0 deletions ci-operator/step-registry/single-node/conf/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
approvers:
- romfreiman
- eranco74
- tsorya
- osherdp
- yuvigold
- omertuc
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash

set -o errexit
set -o nounset
set -o pipefail

pip3 install pyyaml --user
python3 -c '
import yaml
import sys

input_file = sys.argv[1]
output_file = sys.argv[2] if len(sys.argv) == 3 else sys.argv[1] # Output in-place if destination not given

with open(input_file) as f:
cfg = yaml.safe_load(f)

# Some workflows do not define controlPlane in install-config.yaml
if not "controlPlane" in cfg:
cfg["controlPlane"] = {}

cfg["controlPlane"]["replicas"] = 1

# Some workflows do not define any compute machine pools in install-config.yaml
if not "compute" in cfg:
cfg["compute"] = [
{
"name": "worker",
"platform": {},
}
]

for machine_pool in cfg["compute"]:
machine_pool["replicas"] = 0

with open(output_file, "w") as f:
yaml.safe_dump(cfg, f)
' "${SHARED_DIR}/install-config.yaml"
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"path": "single-node/conf/single-node-conf-ref.yaml",
"owners": {
"approvers": [
"romfreiman",
"eranco74",
"tsorya",
"osherdp",
"yuvigold",
"omertuc"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ref:
as: single-node-conf
from: installer
commands: single-node-conf-commands.sh
resources:
requests:
cpu: 10m
memory: 100Mi
documentation: |-
Modifies install-config.yaml to use a single control-plane node and without any workers.
3 changes: 0 additions & 3 deletions core-services/template-deprecation/_allowlist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -595,9 +595,6 @@ templates:
pull-ci-openshift-installer-master-e2e-aws-rhel8:
generated: false
kind: presubmit
pull-ci-openshift-installer-master-e2e-aws-single-node:
generated: false
kind: presubmit
pull-ci-openshift-installer-release-4.4-e2e-aws-rhel8:
generated: false
kind: presubmit
Expand Down