Skip to content

[api] Rename dockerfile #53997

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-bot merged 2 commits into from
Jul 11, 2024
Merged

[api] Rename dockerfile #53997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a5085
[api] Rename dockerfile
ashwindasr Jul 3, 2024
8fbbb4a
run make jobs
ashwindasr Jul 10, 2024
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
20 changes: 10 additions & 10 deletions ci-operator/config/openshift/api/openshift-api-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
build_root:
from_repository: true
images:
- dockerfile_path: Dockerfile.rhel8
- dockerfile_path: Dockerfile.ocp
inputs:
ocp_4.16_base-rhel9:
as:
Expand Down Expand Up @@ -100,24 +100,24 @@ tests:
container:
from: bin
- as: e2e-aws-ovn
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-aws-ovn-techpreview
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
env:
FEATURE_SET: TechPreviewNoUpgrade
workflow: openshift-e2e-aws
- as: e2e-aws-serial
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
workflow: openshift-e2e-aws-serial
- as: e2e-aws-serial-techpreview
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
env:
Expand All @@ -126,30 +126,30 @@ tests:
workflow: openshift-e2e-aws-serial
- as: e2e-gcp
optional: true
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: gcp
workflow: openshift-e2e-gcp
- as: e2e-azure
optional: true
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: azure4
workflow: openshift-e2e-azure
- as: e2e-upgrade
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
workflow: openshift-upgrade-aws
- as: e2e-upgrade-minor
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: aws
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial-minor
workflow: openshift-upgrade-aws
- as: e2e-aws-ovn-hypershift
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
steps:
cluster_profile: hypershift
workflow: hypershift-aws-e2e-external
Expand Down
18 changes: 9 additions & 9 deletions ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-aws-ovn
rerun_command: /test e2e-aws-ovn
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -147,7 +147,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-aws-ovn-hypershift
rerun_command: /test e2e-aws-ovn-hypershift
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -226,7 +226,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-aws-ovn-techpreview
rerun_command: /test e2e-aws-ovn-techpreview
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -305,7 +305,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-aws-serial
rerun_command: /test e2e-aws-serial
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -384,7 +384,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-aws-serial-techpreview
rerun_command: /test e2e-aws-serial-techpreview
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -464,7 +464,7 @@ presubmits:
name: pull-ci-openshift-api-master-e2e-azure
optional: true
rerun_command: /test e2e-azure
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -544,7 +544,7 @@ presubmits:
name: pull-ci-openshift-api-master-e2e-gcp
optional: true
rerun_command: /test e2e-gcp
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -627,7 +627,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-upgrade
rerun_command: /test e2e-upgrade
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down Expand Up @@ -706,7 +706,7 @@ presubmits:
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-api-master-e2e-upgrade-minor
rerun_command: /test e2e-upgrade-minor
run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
spec:
containers:
- args:
Expand Down