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

[ST] Move AZP profiles from STs' pom.xml and remove profiles related to Jenkins #9942

Merged
merged 2 commits into from
Apr 11, 2024

Conversation

im-konge
Copy link
Member

@im-konge im-konge commented Apr 10, 2024

Type of change

  • Enhancement

Description

This PR creates a new settings XML file for the STs profiles for the AZP located in the .azure/systemtests folder and remove all the AZP profiles from STs' pom.xml file.
The movement of these profiles from the pom.xml file was discussed multiple times and as mentioned -> we should not have various profiles of the STs for each CI in the pom.xml, but we should follow the path of having the settings.xml containing needed profiles in each CI/CD.

This PR also removes few of the profiles (bridge, olm_acceptance_upgrade) that are used only on the Jenkins (and will be added into the separate settings.xml file directly on the Jenkins instance).

The properties from none profile are set by default, so I removed that profile as well.

Checklist

  • Make sure all tests pass

Signed-off-by: Lukas Kral <lukywill16@gmail.com>
@im-konge im-konge requested a review from a team April 10, 2024 12:30
@im-konge im-konge self-assigned this Apr 10, 2024
@im-konge im-konge added this to the 0.41.0 milestone Apr 10, 2024
@im-konge
Copy link
Member Author

/azp list

@im-konge
Copy link
Member Author

/azp run acceptance

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@im-konge
Copy link
Member Author

/azp run upgrade

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@scholzj scholzj left a comment

Choose a reason for hiding this comment

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

So, is that used on Azure only?

@im-konge
Copy link
Member Author

Those profiles with prefix azp_ are really just profiles used on Azure.
The bridge and olm_acceptance_upgrade are profiles used in the Jenkins - where will be added as part of the separate settings.xml just for the Jenkins instance.

The none profile is not used as the properties are set by default.

@scholzj
Copy link
Member

scholzj commented Apr 10, 2024

Well, I guess it has nothing to do with scripts, so that likely isn't the right place. And if it is no Azure only, what about some more neutral place? E.g. as a resource in system tests? Or next to the pom.xml in system tests? Or something like that?

@im-konge
Copy link
Member Author

I thought that having it in the .azure folder makes sense, as the profiles are only related to Azure. But if it would be better to have it in the systemtest folder, I can move it there.

@scholzj
Copy link
Member

scholzj commented Apr 10, 2024

Well, the The bridge and olm_acceptance_upgrade are profiles used in the Jenkins part is a bit confusing. If they are related only to Azure, I think having it under .azure is fine. But it is not related to the scripts. So either directly in .azure or in some new subdirectory?

@im-konge
Copy link
Member Author

The bridge and olm_acceptance_upgrade are removed from the pom.xml, but they are not present in the new systemtest-settings.xml file, as they will be added directly to the new file in Jenkins.

So the systemtest-settings.xml in .azure/scripts contains just the AZP profiles.

But yeah, you are right that it's not related to the scripts, so moving it from the scripts folder to .azure/systemtests for example makes more sense.

@im-konge im-konge changed the title [ST] Move AZP profiles from STs' pom.xml [ST] Move AZP profiles from STs' pom.xml and remove profiles related to Jenkins Apr 10, 2024
@im-konge
Copy link
Member Author

I changed the PR name and description - that should make the things clearer.

Signed-off-by: Lukas Kral <lukywill16@gmail.com>
@im-konge im-konge requested a review from scholzj April 10, 2024 14:54
@im-konge
Copy link
Member Author

/azp run bridge

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@im-konge im-konge merged commit 09e2bfe into strimzi:main Apr 11, 2024
15 checks passed
@im-konge im-konge deleted the azp-profiles branch April 11, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants