Skip to content

Update settings.xml generation naming. Remove old code. Update script… #2178

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
merged 1 commit into from
Oct 15, 2024
Merged

Update settings.xml generation naming. Remove old code. Update script… #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions ...sor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ private String getMavenSetup() {
<settings>
<mirrors>
<mirror>
<id>mirror.default</id>
<id>indy-mvn</id>
<url>${PROXY_URL}</url>
<mirrorOf>*</mirrorOf>
</mirror>
Expand All @@ -237,7 +237,7 @@ private String getMavenSetup() {
<!-- Allows a secondary Maven build to use results of prior (e.g. Gradle) deployment -->
<profiles>
<profile>
<id>alternate</id>
<id>secondary</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand All @@ -263,7 +263,7 @@ private String getMavenSetup() {
</pluginRepositories>
</profile>
<profile>
<id>deployment</id>
<id>local-deployment</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand All @@ -281,6 +281,25 @@ private String getMavenSetup() {
// This block is only needed when running outside of JBS
if (isEmpty(System.getenv("jvm-build-service"))) {
result += """
<!--
Needed for Maven 3.9+. Switched to native resolver
https://maven.apache.org/guides/mini/guide-resolver-transport.html
-->
<servers>
<server>
<id>indy-mvn</id>
<configuration>
<connectionTimeout>60000</connectionTimeout>
<httpHeaders>
<property>
<name>Authorization</name>
<value>Bearer ${accessToken}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>

<proxies>
<proxy>
<id>indy-http</id>
Expand All @@ -291,7 +310,7 @@ private String getMavenSetup() {
<!-- <username>build-ADDTW3JAGHYAA+tracking</username> -->
<username>${BUILD_ID}+tracking</username>
<password>${MVN_TOKEN}</password>
<nonProxyHosts>indy|localhost</nonProxyHosts>
<nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
</proxy>
<proxy>
<id>indy-https</id>
Expand All @@ -301,7 +320,7 @@ private String getMavenSetup() {
<port>80</port>
<username>${BUILD_ID}+tracking</username>
<password>${MVN_TOKEN}</password>
<nonProxyHosts>indy|localhost</nonProxyHosts>
<nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
</proxy>
</proxies>
""";
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type SystemConfigList struct {

const (
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/SCRIPTS/deploy/tasks/pre-build.yaml"
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
)
5 changes: 1 addition & 4 deletions pkg/reconciler/dependencybuild/dependencybuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ const (
MemoryIncrement = 2048

PipelineRunFinalizer = "jvmbuildservice.io/finalizer"
JavaHome = "JAVA_HOME"
DeploySuffix = "-deploy"
)

Expand Down Expand Up @@ -468,9 +467,7 @@ func (r *ReconcileDependencyBuild) processBuilderImages(ctx context.Context) ([]
if err != nil {
return nil, err
}
//TODO how important is the order here? do we want 11,8,17 per the old form at https://github.com/redhat-appstudio/jvm-build-service/blob/b91ec6e1888e43962cba16fcaee94e0c9f64557d/deploy/operator/config/system-config.yaml#L8
// the unit tests's imaage verification certainly assumes a order
result := []BuilderImage{}
result := make([]BuilderImage, 0)
for _, val := range systemConfig.Spec.Builders {
result = append(result, BuilderImage{
Image: val.Image,
Expand Down
Loading