Skip to content

Add one of the new style upgrade tests to ci-operator #3030

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
Mar 10, 2019
Merged

Add one of the new style upgrade tests to ci-operator #3030

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
5 changes: 5 additions & 0 deletions .../config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@ tests:
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: aws
- as: e2e-aws-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
upgrade: true
cluster_profile: aws
5 changes: 5 additions & 0 deletions ci-operator/config/openshift/origin/openshift-origin-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ tests:
commands: TEST_SUITE=openshift/image-registry run-tests
openshift_installer:
cluster_profile: aws
- as: e2e-aws-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
upgrade: true
cluster_profile: aws
- as: e2e-aws-serial
commands: TEST_SUITE=openshift/conformance/serial run-tests
openshift_installer:
Expand Down
5 changes: 5 additions & 0 deletions ci-operator/infra/openshift/release-controller/ocp-4.0-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
"e2e-aws-serial":{
"disabled":false,
"prowJob":{"name":"release-openshift-origin-installer-e2e-aws-serial-4.0"}
},
"upgrade":{
"upgrade":true,
"optional":true,
"prowJob":{"name":"release-openshift-origin-installer-e2e-aws-upgrade-4.0"}
}
}
}
43 changes: 43 additions & 0 deletions ...nshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,49 @@ presubmits:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
trigger: '(?m)^/test (?:.*? )?e2e-aws(?: .*?)?$'
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-aws-upgrade
decorate: true
decoration_config:
skip_cloning: true
name: pull-ci-openshift-cluster-version-operator-master-e2e-aws-upgrade
optional: true
rerun_command: /test e2e-aws-upgrade
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
- --target=e2e-aws-upgrade
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-cluster-version-operator-master.yaml
name: ci-operator-master-configs
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
name: cluster-profile
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
- agent: kubernetes
always_run: true
branches:
Expand Down
43 changes: 43 additions & 0 deletions ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,49 @@ presubmits:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
trigger: '(?m)^/test (?:.*? )?e2e-aws-serial(?: .*?)?$'
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-aws-upgrade
decorate: true
decoration_config:
skip_cloning: true
name: pull-ci-openshift-origin-master-e2e-aws-upgrade
optional: true
rerun_command: /test e2e-aws-upgrade
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile
- --target=e2e-aws-upgrade
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-origin-master.yaml
name: ci-operator-master-configs
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
name: cluster-profile
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$'
- agent: kubernetes
always_run: false
branches:
Expand Down
162 changes: 141 additions & 21 deletions ci-operator/jobs/openshift/release/openshift-release-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,87 @@
periodics:
- agent: kubernetes
cron: ""
decorate: true
interval: 8h
name: release-promote-openshift-machine-os-content-e2e-aws-4.0
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --secret-dir=/usr/local/e2e-aws-cluster-profile
- --template=/usr/local/e2e-aws
Copy link
Member

@wking wking Mar 11, 2019

Choose a reason for hiding this comment

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

The installer is still hitting the builds.json API to decide which RHCOS build to use for the AMIs, so I dunno if this promotion test is actually protecting us from boot-image issues at the moment. For example:

$ curl -s https://storage.googleapis.com/origin-ci-test/logs/release-promote-openshift-machine-os-content-e2e-aws-4.0/10/artifacts/e2e-aws/installer/.openshift_install.log | grep RHCOS
time="2019-03-11T03:28:56Z" level=debug msg="Fetching RHCOS builds from \"https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/builds.json\""
time="2019-03-11T03:28:57Z" level=debug msg="Fetching RHCOS metadata from \"https://releases-rhcos.svc.ci.openshift.org/storage/releases/maipo/400.7.20190306.0/meta.json\""

We'll also need something like the in-flight openshift/installer#1286 and maybe openshift/origin#21998 for that.

I guess this promotion test is currently giving us gate-protection for the OSContainer image, protecting us from post-pivot changes?

- --input-hash=$(BUILD_ID)
- --promote
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
value: |
tag_specification:
name: '4.0'
namespace: ocp
promotion:
name: '4.0'
namespace: ocp
additional_images:
machine-os-content: machine-os-content
build_root:
image_stream_tag:
cluster: https://api.ci.openshift.org
name: release
namespace: openshift
tag: golang-1.10
base_images:
machine-os-content:
name: maipo
namespace: rhcos
tag: latest
raw_steps:
- output_image_tag_step:
from: machine-os-content
to:
name: stable
tag: machine-os-content
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-aws
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: aws
- name: JOB_NAME_SAFE
value: e2e-aws
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-aws
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- agent: kubernetes
cron: '@yearly'
decorate: true
Expand All @@ -17,11 +100,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/openshift/origin-release:v4.0
- name: IMAGE_FORMAT
value: registry.svc.ci.openshift.org/openshift/origin-v4.0:${component}
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
Expand Down Expand Up @@ -55,6 +134,59 @@ periodics:
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- agent: kubernetes
cron: '@yearly'
decorate: true
interval: ""
name: release-openshift-origin-installer-e2e-aws-upgrade-4.0
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/release-e2e-aws-upgrade-cluster-profile
- --target=release-e2e-aws
- --template=/usr/local/release-e2e-aws-upgrade
- --input-hash=$(BUILD_ID)
command:
- ci-operator
env:
- name: RELEASE_IMAGE_INITIAL
- name: RELEASE_IMAGE_LATEST
- name: IMAGE_FORMAT
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-origin-master.yaml
name: ci-operator-configs
- name: JOB_NAME_SAFE
value: release-e2e-aws-upgrade
- name: TEST_COMMAND
value: TEST_SUITE=all run-upgrade-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/release-e2e-aws-upgrade-cluster-profile
name: cluster-profile
- mountPath: /usr/local/release-e2e-aws-upgrade
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- agent: kubernetes
cron: '@yearly'
decorate: true
Expand All @@ -65,19 +197,15 @@ periodics:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/release-e2e-aws-cluster-profile
- --secret-dir=/usr/local/release-e2e-aws-serial-cluster-profile
- --target=release-e2e-aws
- --template=/usr/local/release-e2e-aws
- --template=/usr/local/release-e2e-aws-serial
- --input-hash=$(BUILD_ID)
command:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/openshift/origin-release:v4.0
- name: IMAGE_FORMAT
value: registry.svc.ci.openshift.org/openshift/origin-v4.0:${component}
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
Expand All @@ -86,7 +214,7 @@ periodics:
key: openshift-origin-master.yaml
name: ci-operator-configs
- name: JOB_NAME_SAFE
value: release-e2e-aws
value: release-e2e-aws-serial
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/serial run-tests
image: ci-operator:latest
Expand All @@ -96,9 +224,9 @@ periodics:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/release-e2e-aws-cluster-profile
- mountPath: /usr/local/release-e2e-aws-serial-cluster-profile
name: cluster-profile
- mountPath: /usr/local/release-e2e-aws
- mountPath: /usr/local/release-e2e-aws-serial
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
serviceAccountName: ci-operator
Expand Down Expand Up @@ -130,11 +258,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/openshift/origin-release:v4.0
- name: IMAGE_FORMAT
value: registry.svc.ci.openshift.org/openshift/origin-v4.0:${component}
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
Expand Down Expand Up @@ -191,8 +315,6 @@ periodics:
value: registry.svc.ci.openshift.org/ocp/release:v4.0
- name: IMAGE_FORMAT
value: registry.svc.ci.openshift.org/ocp/4.0:${component}
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
Expand Down Expand Up @@ -247,8 +369,6 @@ periodics:
value: registry.svc.ci.openshift.org/ocp/release:v4.0
- name: IMAGE_FORMAT
value: registry.svc.ci.openshift.org/ocp/4.0:${component}
- name: RPM_REPO_OPENSHIFT_ORIGIN
value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -215,6 +215,8 @@ objects:
value: test
- name: HOME
value: /tmp
- name: INSTALL_INITIAL_RELEASE
- name: RELEASE_IMAGE_INITIAL
command:
- /bin/sh
- -c
Expand All @@ -226,7 +228,7 @@ objects:
cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer

if [[ -n "${INSTALL_INITIAL_RELEASE-}" && -n "${RELEASE_IMAGE_INITIAL-}" ]]; then
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
echo "Installing from initial release ${RELEASE_IMAGE_INITIAL}"
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${RELEASE_IMAGE_INITIAL}"
else
Expand Down
Loading