Skip to content
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.

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

WIP [ART-7190] Switch to openshift-eng/art-tools #3860

Closed
wants to merge 1 commit into from
Closed

WIP [ART-7190] Switch to openshift-eng/art-tools #3860

wants to merge 1 commit into from

Conversation

ashwindasr
Copy link
Contributor

@ashwindasr ashwindasr commented Aug 3, 2023

Switch to openshift-eng/art-tools. Ref ART-7190

Gen-assembly test run.
Prepare-release test run

@ashwindasr ashwindasr added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2023
@ashwindasr
Copy link
Contributor Author

Do not merge before @ashwindasr runs the code to sync doozer and elliott to art-tools

@thegreyd
Copy link
Contributor

thegreyd commented Aug 3, 2023

Can you include a test job?

@@ -164,7 +164,9 @@ def setup_venv(use_python38=false) {
commonlib.shell(script: "rm -rf art-tools/elliott ; cd art-tools; git clone https://github.com/${where[0]}/elliott.git; cd elliott; git checkout ${where[1]}")
Copy link
Contributor

@thegreyd thegreyd Aug 3, 2023

Choose a reason for hiding this comment

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

doozer_commit and elliott_commit params would stop working, and I think we want to have a art_tools_commit / tools_commit in place of them (see promote / prepare release / build-sync accepting them)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see, let me see if I can understand whats happening. But when we ran the prepare release test job as dry run, it worked.

Copy link
Contributor

@thegreyd thegreyd Aug 4, 2023

Choose a reason for hiding this comment

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

For prepare-release the change was recent and the job run is older (13 days ago) so it doesn't have the elliott_commit param. To see it break you would have to run it with a elliott_commit value like ashwindasr@some_branch_name

See #3847

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Understood, will start working on those as well and will add to this PR

@@ -164,7 +164,9 @@ def setup_venv(use_python38=false) {
commonlib.shell(script: "rm -rf art-tools/elliott ; cd art-tools; git clone https://github.com/${where[0]}/elliott.git; cd elliott; git checkout ${where[1]}")
}

commonlib.shell(script: "pip install -e art-tools/elliott/ -e art-tools/doozer/ -e pyartcd/")
commonlib.shell(script: "cd art-tools; rm -rf art-tools; git clone https://github.com/openshift-eng/art-tools.git; cd art-tools; git checkout master")
Copy link
Contributor

Choose a reason for hiding this comment

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

How does this work? Are we not having art-tools as a submodule to aos-cd-jobs (sorry if i forgot a previous discussion) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, I wasn't sure about the stance about sub-modules. The long term vision was to replace the art-tools directory with the art-tools repo on the root level of aos-cd-jobs. Not sure if we wanted to clone or do submodule. But for the purposes of this PR, we need art-tools in the same directory as doozer and elliott submodules, so if you think its a good idea, I can add that as a submodule instead of cloning.

Copy link
Contributor

Choose a reason for hiding this comment

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

I like our current pattern of keeping it as a submodule, and let's keep it on the root level so it's not art-tools/art-tools?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh regarding that, I wanted to keep this PR reversible. If something happens and we need to roll back, we just need to change the paths to the old doozer and elliott submodules. I was thinking if after a couple of releases we don't have any issues, I'll swap in the whole art-tools folder in the root level. What do you think?

Copy link
Contributor

@thegreyd thegreyd Aug 8, 2023

Choose a reason for hiding this comment

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

What will go wrong though? :)
If we've tested things and it works I don't see us rolling back. And if in case we do need to rollback, we'll revert this PR, and add back individual submodules - does not sound much effort to me. I would say let's go forward and not think of going back, we fix issues as they come up

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense. I was trying to follow a defensive approach, but with the brainpower of our team, I think we can push forward

@ashwindasr
Copy link
Contributor Author

Can you include a test job?

Apologies, have added now

@thegreyd thegreyd changed the title Switch to openshift-eng/art-tools ART-7190 Switch to openshift-eng/art-tools Aug 4, 2023
@ashwindasr
Copy link
Contributor Author

/retitle [ART-7190 Switch to openshift-eng/art-tools

@openshift-ci openshift-ci bot changed the title ART-7190 Switch to openshift-eng/art-tools [ART-7190 Switch to openshift-eng/art-tools Aug 8, 2023
@ashwindasr
Copy link
Contributor Author

/assign @ashwindasr

@ashwindasr
Copy link
Contributor Author

/retitle [ART-7190] Switch to openshift-eng/art-tools

@openshift-ci openshift-ci bot changed the title [ART-7190 Switch to openshift-eng/art-tools [ART-7190] Switch to openshift-eng/art-tools Aug 8, 2023
@ashwindasr
Copy link
Contributor Author

/unhold /wip

@ashwindasr
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 8, 2023
@ashwindasr
Copy link
Contributor Author

/wip

@ashwindasr
Copy link
Contributor Author

/retitle WIP [ART-7190] Switch to openshift-eng/art-tools

@openshift-ci openshift-ci bot changed the title [ART-7190] Switch to openshift-eng/art-tools WIP [ART-7190] Switch to openshift-eng/art-tools Aug 8, 2023
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 8, 2023
@ashwindasr
Copy link
Contributor Author

Closing in favor of #3881

@ashwindasr ashwindasr closed this Aug 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants