Update tests to remove codeflare subscription creation #139

ChughShilpa · 2023-10-10T11:22:01Z

Update Distributed Workloads tests to remove Codeflare subscription creation to implement the new deployment strategy of Codeflare Operator

Fixes #21

Description

Update tests to remove codeflare subscription creation

How Has This Been Tested?

Merge criteria:

The commits are squashed in a cohesive manner and have meaningful messages.
Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
The developer has manually tested the changes and verified that the changes work

openshift-ci · 2023-10-10T11:22:06Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

sutaakar · 2023-10-10T15:02:04Z

The tests/resources/codeflare-subscription.yaml is related to the bash tests, IMHO we should delete the bash tests completely as we don't leverage odh-manifests repository any more (can be tracked as another task).
This issue from my perspective is to delete resources used in PR checks and update readme for tests:

delete https://github.com/opendatahub-io/distributed-workloads/blob/main/contrib/configuration/codeflare-operator-subscription.yaml

delete

distributed-workloads/Makefile

Lines 57 to 81 in cbdbed2

    
           .PHONY: install-codeflare-operator 
        
           install-codeflare-operator: ## Install CodeFlare operator 
        
           	@echo -e "\n==> Installing CodeFlare Operator \n" 
        
           	oc create -f contrib/configuration/codeflare-operator-subscription.yaml 
        
           	@echo Waiting for codeflare-operator Subscription to be ready 
        
           	oc wait -n openshift-operators subscription/codeflare-operator --for=jsonpath='{.status.state}'=AtLatestKnown --timeout=180s 
        
           .PHONY: delete-codeflare-operator 
        
           delete-codeflare-operator: ## Delete CodeFlare operator 
        
           	@echo -e "\n==> Deleting CodeFlare Operator \n" 
        
           	-oc delete subscription codeflare-operator -n openshift-operators 
        
           	-export CLUSTER_SERVICE_VERSION=`oc get clusterserviceversion -n openshift-operators -l operators.coreos.com/codeflare-operator.openshift-operators -o custom-columns=:metadata.name`; \ 
        
           	oc delete clusterserviceversion $$CLUSTER_SERVICE_VERSION -n openshift-operators 
        
           .PHONY: install-codeflare-operator-from-github 
        
           install-codeflare-operator-from-github: ## Install CodeFlare operator from main branch on GitHub 
        
           	@echo -e "\n==> Installing CodeFlare Operator from main branch on GitHub \n" 
        
           	test -d $(TMPDIR)/codeflare || git clone https://github.com/project-codeflare/codeflare-operator.git $(TMPDIR)/codeflare 
        
           	VERSION=dev make deploy -C $(TMPDIR)/codeflare 
        
           .PHONY: delete-codeflare-operator-from-github 
        
           delete-codeflare-operator-from-github: ## Delete CodeFlare operator from main branch on GitHub 
        
           	@echo -e "\n==> Deleting CodeFlare Operator from main branch on GitHub \n" 
        
           	test -d $(TMPDIR)/codeflare || git clone https://github.com/project-codeflare/codeflare-operator.git $(TMPDIR)/codeflare 
        
           	make undeploy -C $(TMPDIR)/codeflare

and respective part in all-in-one task

adjust OpenShift CI - https://github.com/openshift/release/blob/master/ci-operator/config/opendatahub-io/distributed-workloads/opendatahub-io-distributed-workloads-main.yaml

ChughShilpa · 2023-10-11T07:18:27Z

The tests/resources/codeflare-subscription.yaml is related to the bash tests, IMHO we should delete the bash tests completely as we don't leverage odh-manifests repository any more (can be tracked as another task). This issue from my perspective is to delete resources used in PR checks and update readme for tests:

delete https://github.com/opendatahub-io/distributed-workloads/blob/main/contrib/configuration/codeflare-operator-subscription.yaml

delete

distributed-workloads/Makefile

Lines 57 to 81 in cbdbed2

.PHONY: install-codeflare-operator

install-codeflare-operator: ## Install CodeFlare operator

@echo -e "\n==> Installing CodeFlare Operator \n"

oc create -f contrib/configuration/codeflare-operator-subscription.yaml

@echo Waiting for codeflare-operator Subscription to be ready

oc wait -n openshift-operators subscription/codeflare-operator --for=jsonpath='{.status.state}'=AtLatestKnown --timeout=180s

.PHONY: delete-codeflare-operator

delete-codeflare-operator: ## Delete CodeFlare operator

@echo -e "\n==> Deleting CodeFlare Operator \n"

-oc delete subscription codeflare-operator -n openshift-operators

-export CLUSTER_SERVICE_VERSION=`oc get clusterserviceversion -n openshift-operators -l operators.coreos.com/codeflare-operator.openshift-operators -o custom-columns=:metadata.name`; \

oc delete clusterserviceversion $$CLUSTER_SERVICE_VERSION -n openshift-operators

.PHONY: install-codeflare-operator-from-github

install-codeflare-operator-from-github: ## Install CodeFlare operator from main branch on GitHub

@echo -e "\n==> Installing CodeFlare Operator from main branch on GitHub \n"

test -d $(TMPDIR)/codeflare || git clone https://github.com/project-codeflare/codeflare-operator.git $(TMPDIR)/codeflare

VERSION=dev make deploy -C $(TMPDIR)/codeflare

.PHONY: delete-codeflare-operator-from-github

delete-codeflare-operator-from-github: ## Delete CodeFlare operator from main branch on GitHub

@echo -e "\n==> Deleting CodeFlare Operator from main branch on GitHub \n"

test -d $(TMPDIR)/codeflare || git clone https://github.com/project-codeflare/codeflare-operator.git $(TMPDIR)/codeflare

make undeploy -C $(TMPDIR)/codeflare

and respective part in all-in-one task

adjust OpenShift CI - https://github.com/openshift/release/blob/master/ci-operator/config/opendatahub-io/distributed-workloads/opendatahub-io-distributed-workloads-main.yaml

Thanks for the clarification @sutaakar
I understood it in the opposite way and assumed removing codeflare-operator-subscription.yaml and updating makefile file will be covered in a different task

I will the update this PR.

ChughShilpa · 2023-10-12T11:42:03Z

@sutaakar
Updated with changes.
PR for Openshift CI : openshift/release#44282

sutaakar · 2023-10-16T02:14:47Z

Thanks, currently this is blocked by opendatahub-io/opendatahub-operator#604.
Once the PR is merged and new ODH version released then this PR can be merged.

dimakis · 2023-10-19T11:03:15Z

Thanks, currently this is blocked by opendatahub-io/opendatahub-operator#604. Once the PR is merged and new ODH version released then this PR can be merged.

@ChughShilpa @sutaakar why is this blokced by that PR?

sutaakar · 2023-10-24T11:19:00Z

@dimakis I guess that the referenced PR implements the migration of manifests from ODH/DW to ODH/CFO repo, which is needed for this change. Though I am not 100% sure of that PR functionality.

openshift-ci · 2023-11-27T10:52:58Z

@ChughShilpa: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-odh-dw	`cfce2ee`	link	true	`/test e2e-odh-dw`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

sutaakar

/lgtm

openshift-ci · 2023-11-27T13:12:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sutaakar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [sutaakar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sutaakar · 2023-11-27T13:18:19Z

Merging manually as the PR check is broken

openshift-ci bot added the do-not-merge/work-in-progress label Oct 10, 2023

ChughShilpa marked this pull request as ready for review October 10, 2023 11:27

openshift-ci bot removed the do-not-merge/work-in-progress label Oct 10, 2023

openshift-ci bot requested review from KPostOffice and tedhtchang October 10, 2023 11:27

ChughShilpa requested review from sutaakar and removed request for tedhtchang and KPostOffice October 10, 2023 11:27

ChughShilpa force-pushed the removeCodeflareSubscription branch from 01938b8 to 01b6366 Compare October 12, 2023 11:18

ChughShilpa mentioned this pull request Oct 12, 2023

ODH DW: Update CI to remove CodeflarOperator installation openshift/release#44282

Closed

ChughShilpa force-pushed the removeCodeflareSubscription branch from 01b6366 to 16bf414 Compare October 20, 2023 10:04

ChughShilpa requested a review from jiripetrlik October 20, 2023 10:06

delete_codeflaresubscription_resources

cfce2ee

ChughShilpa force-pushed the removeCodeflareSubscription branch from dccc83b to cfce2ee Compare November 27, 2023 10:32

sutaakar approved these changes Nov 27, 2023

View reviewed changes

openshift-ci bot assigned sutaakar Nov 27, 2023

openshift-ci bot added the lgtm label Nov 27, 2023

openshift-ci bot added the approved label Nov 27, 2023

sutaakar merged commit 23cb029 into opendatahub-io:main Nov 27, 2023
1 of 3 checks passed

ChughShilpa deleted the removeCodeflareSubscription branch November 27, 2023 13:33

ChughShilpa mentioned this pull request Dec 6, 2023

Update upstream Distributed Workloads tests to remove subscription creation red-hat-data-services/distributed-workloads#21

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update tests to remove codeflare subscription creation #139

Update tests to remove codeflare subscription creation #139

ChughShilpa commented Oct 10, 2023 •

edited

Loading

openshift-ci bot commented Oct 10, 2023

sutaakar commented Oct 10, 2023

ChughShilpa commented Oct 11, 2023

ChughShilpa commented Oct 12, 2023 •

edited

Loading

sutaakar commented Oct 16, 2023

dimakis commented Oct 19, 2023

sutaakar commented Oct 24, 2023

openshift-ci bot commented Nov 27, 2023

sutaakar left a comment

openshift-ci bot commented Nov 27, 2023

sutaakar commented Nov 27, 2023

Update tests to remove codeflare subscription creation #139

Update tests to remove codeflare subscription creation #139

Conversation

ChughShilpa commented Oct 10, 2023 • edited Loading

Description

How Has This Been Tested?

Merge criteria:

openshift-ci bot commented Oct 10, 2023

sutaakar commented Oct 10, 2023

ChughShilpa commented Oct 11, 2023

ChughShilpa commented Oct 12, 2023 • edited Loading

sutaakar commented Oct 16, 2023

dimakis commented Oct 19, 2023

sutaakar commented Oct 24, 2023

openshift-ci bot commented Nov 27, 2023

sutaakar left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Nov 27, 2023

sutaakar commented Nov 27, 2023

ChughShilpa commented Oct 10, 2023 •

edited

Loading

ChughShilpa commented Oct 12, 2023 •

edited

Loading