Skip to content

USHIFT-901: Rework microshift periodic jobs definitions #36650

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 7, 2023
Merged

USHIFT-901: Rework microshift periodic jobs definitions #36650

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
ad5196b
USHIFT-901: Merge periodics and presubmits for 4.12 in one file
pacevedom Feb 22, 2023
42c0597
USHIFT-901: Merge periodics and presubmits for 4.13 in one file
pacevedom Feb 22, 2023
ff3517b
USHIFT-901: Use nightly releases for rebase
pacevedom Mar 3, 2023
cc2c1d0
USHIFT-901: Merge periodics and presubmits for main in one file
pacevedom Mar 7, 2023
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
49 changes: 49 additions & 0 deletions ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ base_images:
name: "4.14"
namespace: ocp
tag: tests
ubi-minimal:
name: ubi-minimal
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: release
Expand Down Expand Up @@ -63,12 +67,53 @@ images:
- destination_dir: .
source_path: /usr/bin/openshift-tests
to: dependency-payload
- dockerfile_literal: |
# build
FROM ubi-minimal
ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
exit 1 ; \
fi ; \
chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
from: ubi-minimal
to: yq-cli
- dockerfile_literal: |
FROM src
COPY yq /usr/bin/yq
RUN yum install -y --nodocs python3-devel && \
pip3 install pygithub GitPython && \
dnf clean all && \
rm -rf /var/cache/dnf/*
from: src
inputs:
yq-cli:
paths:
- destination_dir: .
source_path: /usr/bin/yq
to: microshift-rebase
promotion:
excluded_images:
- dependency-payload
- microshift-validate
- yq-cli
- microshift-rebase
name: "4.14"
namespace: ocp
releases:
nightly-amd64:
candidate:
product: ocp
stream: nightly
version: "4.14"
nightly-arm64:
candidate:
architecture: arm64
product: ocp
stream: nightly
version: "4.14"
resources:
'*':
limits:
Expand Down Expand Up @@ -121,6 +166,10 @@ tests:
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-router-smoke-test
- as: rebase-on-nightlies
cron: 0 5 * * 1-5
steps:
workflow: openshift-microshift-rebase
zz_generated_metadata:
branch: main
org: openshift
Expand Down
149 changes: 0 additions & 149 deletions ci-operator/config/openshift/microshift/openshift-microshift-main__periodics.yaml
View file
Open in desktop

This file was deleted.

49 changes: 49 additions & 0 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ base_images:
name: "4.12"
namespace: ocp
tag: tests
ubi-minimal:
name: ubi-minimal
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: release
Expand Down Expand Up @@ -63,12 +67,53 @@ images:
- destination_dir: .
source_path: /usr/bin/openshift-tests
to: dependency-payload
- dockerfile_literal: |
# build
FROM ubi-minimal
ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
ENV YQ_HASH=9e35b817e7cdc358c1fcd8498f3872db169c3303b61645cc1faf972990f37582
RUN echo -n "${YQ_HASH} -" > /tmp/sum.txt ; \
if ! (curl -Ls "${YQ_URL}" | tee /tmp/yq | sha256sum -c /tmp/sum.txt &>/dev/null); then \
echo "ERROR: Expected file at ${YQ_URL} to have checksum ${YQ_HASH} but instead got $(sha256sum </tmp/yq | cut -d' ' -f1)" ; \
exit 1 ; \
fi ; \
chmod +x /tmp/yq && mv /tmp/yq /usr/bin/yq
from: ubi-minimal
to: yq-cli
- dockerfile_literal: |
FROM src
COPY yq /usr/bin/yq
RUN yum install -y --nodocs python3-devel && \
pip3 install pygithub GitPython && \
dnf clean all && \
rm -rf /var/cache/dnf/*
from: src
inputs:
yq-cli:
paths:
- destination_dir: .
source_path: /usr/bin/yq
to: microshift-rebase
promotion:
excluded_images:
- dependency-payload
- microshift-validate
- yq-cli
- microshift-rebase
name: "4.12"
namespace: ocp
releases:
nightly-amd64:
candidate:
product: ocp
stream: nightly
version: "4.12"
nightly-arm64:
candidate:
architecture: arm64
product: ocp
stream: nightly
version: "4.12"
resources:
'*':
limits:
Expand Down Expand Up @@ -116,6 +161,10 @@ tests:
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-8-v20230202
workflow: openshift-microshift-e2e-router-smoke-test
- as: rebase-on-nightlies
cron: 0 5 * * 1-5
steps:
workflow: openshift-microshift-rebase
zz_generated_metadata:
branch: release-4.12
org: openshift
Expand Down
Loading