Skip to content

ci-operator/jobs/openshift/release: Add 4.y-nightly -> 4.(y+1)-nightly #6542

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
Jan 3, 2020
Merged

ci-operator/jobs/openshift/release: Add 4.y-nightly -> 4.(y+1)-nightly #6542

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
105 changes: 105 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4236,6 +4236,111 @@ periodics:
- name: pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 8h
labels:
ci.openshift.io/release-type: informing
job-env: aws
job-release: "4.3"
job-test: e2e
pj-rehearse.openshift.io/can-be-rehearsed: "true"
release.openshift.io/verify: "true"
name: release-openshift-origin-installer-e2e-aws-upgrade-4.2-nightly-to-4.3
spec:
containers:
- command:
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail

initial=$(ARTIFACTS)/release-initial.json
latest=$(ARTIFACTS)/release-latest.json
if ! curl -G https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.2.0-0.nightly/latest > ${initial}; then
echo "error: Could not find a 4.2 nightly version"
exit 1
fi
if ! curl -G https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.3.0-0.nightly/latest > ${latest}; then
echo "error: Could not find a 4.3 nightly version"
exit 1
fi

from=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["name"]' "${initial}" )
to=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["name"]' "${latest}" )
export RELEASE_IMAGE_INITIAL=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["pullSpec"]' "${initial}" )
export RELEASE_IMAGE_LATEST=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["pullSpec"]' "${latest}" )

# prow doesn't allow init containers or a second container
export PATH=$PATH:/tmp/bin
mkdir /tmp/bin
curl https://storage.googleapis.com/origin-ci-test/_tools/4.1.0/oc >/tmp/bin/oc 2>/dev/null
chmod ug+x /tmp/bin/oc

# annotate the information about this job so that the release controller adds it to the upgrade graph
oc annotate pj/${PROW_JOB_ID} "release.openshift.io/from-tag=${from}" "release.openshift.io/tag=${to}" "release.openshift.io/source=ocp/$(BRANCH)"

ci-operator --artifact-dir=$(ARTIFACTS) \
--lease-server=http://boskos \
--secret-dir=/usr/local/pull-secret --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \
--target=e2e-$(CLUSTER_TYPE)-upgrade --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME)
env:
- name: BRANCH
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
value: |
tag_specification:
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- as: e2e-$(CLUSTER_TYPE)-serial
commands: TEST_SUITE=openshift/conformance/serial run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- as: e2e-$(CLUSTER_TYPE)-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
upgrade: true
- as: launch-$(CLUSTER_TYPE)
commands: sleep 9000 & wait
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
name: cluster-profile
- mountPath: /usr/local/pull-secret
name: pull-secret
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- name: pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 12h
Expand Down
105 changes: 105 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 @@ -4196,6 +4196,111 @@ periodics:
- name: pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
labels:
ci.openshift.io/release-type: informing
job-env: aws
job-release: "4.4"
job-test: e2e
pj-rehearse.openshift.io/can-be-rehearsed: "true"
release.openshift.io/verify: "true"
name: release-openshift-origin-installer-e2e-aws-upgrade-4.3-nightly-to-4.4
spec:
containers:
- command:
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail

initial=$(ARTIFACTS)/release-initial.json
latest=$(ARTIFACTS)/release-latest.json
if ! curl -G https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.3.0-0.nightly/latest > ${initial}; then
echo "error: Could not find a 4.3 nightly version"
exit 1
fi
if ! curl -G https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4.4.0-0.nightly/latest > ${latest}; then
echo "error: Could not find a 4.4 nightly version"
exit 1
fi

from=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["name"]' "${initial}" )
to=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["name"]' "${latest}" )
export RELEASE_IMAGE_INITIAL=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["pullSpec"]' "${initial}" )
export RELEASE_IMAGE_LATEST=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["pullSpec"]' "${latest}" )

# prow doesn't allow init containers or a second container
export PATH=$PATH:/tmp/bin
mkdir /tmp/bin
curl https://storage.googleapis.com/origin-ci-test/_tools/4.1.0/oc >/tmp/bin/oc 2>/dev/null
chmod ug+x /tmp/bin/oc

# annotate the information about this job so that the release controller adds it to the upgrade graph
oc annotate pj/${PROW_JOB_ID} "release.openshift.io/from-tag=${from}" "release.openshift.io/tag=${to}" "release.openshift.io/source=ocp/$(BRANCH)"

ci-operator --artifact-dir=$(ARTIFACTS) \
--lease-server=http://boskos \
--secret-dir=/usr/local/pull-secret --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \
--target=e2e-$(CLUSTER_TYPE)-upgrade --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME)
env:
- name: BRANCH
value: "4.4"
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
value: |
tag_specification:
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- as: e2e-$(CLUSTER_TYPE)-serial
commands: TEST_SUITE=openshift/conformance/serial run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- as: e2e-$(CLUSTER_TYPE)-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
upgrade: true
- as: launch-$(CLUSTER_TYPE)
commands: sleep 9000 & wait
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
name: cluster-profile
- mountPath: /usr/local/pull-secret
name: pull-secret
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- name: pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
decorate: true
interval: 48h
Expand Down