Skip to content

Commit 1b76cdb

Browse files
rncrnc
authored
Merge pull request #2261 from rnc/REVERT
Revert adding settings to OCI image
2 parents 70a533a + 95b284b commit 1b76cdb

File tree

4 files changed

+39
-24
lines changed

4 files changed

+39
-24
lines changed

‎deploy/tasks/maven-deployment.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,3 @@ spec:
8484
- --mvn-repo=$(params.MVN_REPO)
8585
- --mvn-username=$(params.MVN_USERNAME)
8686
- --server-id=$(params.MVN_SERVER_ID)
87-
- --mvn-settings=/var/workdir/settings/settings.xml

‎java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void run() {
105105
export MAVEN_HOME=${MAVEN_HOME:=/opt/maven/3.8.8}
106106
export GRADLE_USER_HOME="${JBS_WORKDIR}/software/settings/.gradle"
107107
108-
mkdir -p ${JBS_WORKDIR}/logs ${JBS_WORKDIR}/packages ${JBS_WORKDIR}/settings ${HOME}/.sbt/1.0 ${GRADLE_USER_HOME} ${HOME}/.m2
108+
mkdir -p ${JBS_WORKDIR}/logs ${JBS_WORKDIR}/packages ${HOME}/.sbt/1.0 ${GRADLE_USER_HOME} ${HOME}/.m2
109109
cd ${JBS_WORKDIR}/source
110110
111111
if [ -n "${JAVA_HOME}" ]; then
@@ -119,7 +119,6 @@ public void run() {
119119
runBuild += getMavenSetup();
120120

121121
runBuild += """
122-
cp -a ${HOME}/.m2/*.xml ${JBS_WORKDIR}/settings
123122
fi
124123
125124
if [ -n "${GRADLE_HOME}" ]; then
@@ -191,14 +190,12 @@ private String getContainerFile() {
191190
COPY --from=0 /var/workdir/ /var/workdir/
192191
RUN /opt/jboss/container/java/run/run-java.sh copy-artifacts --source-path=/var/workdir/workspace/source --deploy-path=/var/workdir/workspace/artifacts
193192
FROM scratch
194-
COPY --from=1 /var/workdir/workspace/settings /settings/
195193
COPY --from=1 /var/workdir/workspace/artifacts /deployment/
196194
""".formatted(buildRequestProcessorImage);
197195
} else {
198196
containerFile +=
199197
"""
200198
FROM scratch
201-
COPY --from=0 /var/workdir/workspace/settings /settings/
202199
COPY --from=0 /var/workdir/workspace/artifacts /deployment/
203200
""";
204201
}
@@ -281,24 +278,7 @@ private String getMavenSetup() {
281278
</activeProfiles>
282279
283280
<interactiveMode>false</interactiveMode>
284-
<!--
285-
Needed for Maven 3.9+. Switched to native resolver
286-
https://maven.apache.org/guides/mini/guide-resolver-transport.html
287-
-->
288-
<servers>
289-
<server>
290-
<id>indy-mvn</id>
291-
<configuration>
292-
<connectionTimeout>60000</connectionTimeout>
293-
<httpHeaders>
294-
<property>
295-
<name>Authorization</name>
296-
<value>Bearer ${ACCESS_TOKEN}</value>
297-
</property>
298-
</httpHeaders>
299-
</configuration>
300-
</server>
301-
</servers>
281+
302282
<proxies>
303283
<proxy>
304284
<id>indy-http</id>

‎java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/DeployCommand.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
44

5+
import java.nio.file.Files;
56
import java.nio.file.Path;
67
import java.util.Optional;
78

@@ -25,6 +26,9 @@ public class DeployCommand implements Runnable {
2526
@CommandLine.Option(names = "--mvn-username")
2627
String mvnUser;
2728

29+
@ConfigProperty(name = "access.token")
30+
Optional<String> accessToken;
31+
2832
@ConfigProperty(name = "maven.password")
2933
Optional<String> mvnPassword;
3034

@@ -55,6 +59,38 @@ public void run() {
5559
}
5660
System.setProperty("maven.settings", mvnSettings);
5761
}
62+
if (isNotEmpty(accessToken)) {
63+
String servers = """
64+
<settings>
65+
<!--
66+
Needed for Maven 3.9+. Switched to native resolver
67+
https://maven.apache.org/guides/mini/guide-resolver-transport.html
68+
-->
69+
<servers>
70+
<server>
71+
<id>indy-mvn</id>
72+
<configuration>
73+
<connectionTimeout>60000</connectionTimeout>
74+
<httpHeaders>
75+
<property>
76+
<name>Authorization</name>
77+
<value>Bearer ${ACCESS_TOKEN}</value>
78+
</property>
79+
</httpHeaders>
80+
</configuration>
81+
</server>
82+
</servers>
83+
</settings>
84+
""";
85+
if (isNotEmpty(mvnSettings)) {
86+
// TODO: Would need to merge the two files. NYI for now as I don't think we need this pattern
87+
throw new RuntimeException("Merging settings.xml not supported");
88+
} else {
89+
Path settings = Path.of(deploymentPath.getParent().toString(), "settings.xml");
90+
Files.write(settings, servers.getBytes());
91+
System.setProperty("maven.settings", settings.toString());
92+
}
93+
}
5894
if (isNotEmpty(mvnRepo)) {
5995
// Maven Repo Deployment
6096
MavenRepositoryDeployer deployer = new MavenRepositoryDeployer(mvnCtx, mvnUser, mvnPassword.orElse(""), mvnRepo, serverId, deploymentPath);

‎pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ const (
4949
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
5050
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
5151
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
52-
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
52+
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/REVERT/deploy/tasks/maven-deployment.yaml"
5353
)

0 commit comments

Comments
 (0)