Skip to content

Commit e87fc24

Browse files
committed
Conditionally activate proxies
1 parent 70a533a commit e87fc24

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

deploy/tasks/maven-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ spec:
7878
key: mavenpassword
7979
- name: ACCESS_TOKEN
8080
value: $(params.ACCESS_TOKEN)
81+
- name: PROXY_ENABLED
82+
value: "false"
8183
args:
8284
- deploy
8385
- --directory=/var/workdir/deployment

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ public void run() {
9191
export HOME=${HOME:=/root}
9292
# Custom base working directory.
9393
export JBS_WORKDIR=${JBS_WORKDIR:=/var/workdir/workspace}
94+
# TODO: Until domain-proxy is implemented disable this
95+
export PROXY_ENABLED=false
9496
9597
export LANG="en_US.UTF-8"
9698
export LC_ALL="en_US.UTF-8"
@@ -302,8 +304,7 @@ private String getMavenSetup() {
302304
<proxies>
303305
<proxy>
304306
<id>indy-http</id>
305-
<!-- TODO: Until domain-proxy is implemented disable this - probably needs conditional activation but settings profiles don't support interpolation -->
306-
<active>false</active>
307+
<active>${PROXY_ENABLED}</active>
307308
<protocol>http</protocol>
308309
<host>domain-proxy</host>
309310
<port>80</port>
@@ -314,7 +315,7 @@ private String getMavenSetup() {
314315
</proxy>
315316
<proxy>
316317
<id>indy-https</id>
317-
<active>false</active>
318+
<active>${PROXY_ENABLED}</active>
318319
<protocol>https</protocol>
319320
<host>domain-proxy</host>
320321
<port>80</port>

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/PROXY/deploy/tasks/maven-deployment.yaml"
5353
)

0 commit comments

Comments
 (0)