From 7e5752fd98f70d7835c87cf085e61c842b882282 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Fri, 24 Jan 2025 11:40:04 +0000 Subject: [PATCH] Run prebuild with socksProxy --- deploy/tasks/pre-build.yaml | 3 +++ pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/tasks/pre-build.yaml b/deploy/tasks/pre-build.yaml index 2650668d8..2490afe6a 100644 --- a/deploy/tasks/pre-build.yaml +++ b/deploy/tasks/pre-build.yaml @@ -56,6 +56,9 @@ spec: - --tooling-image=$(params.PNC_KONFLUX_TOOLING_IMAGE) - --type=$(params.BUILD_TOOL) - $(workspaces.source.path)/source + script: | + #!/bin/bash + JAVA_OPTS="-DsocksProxyHost=does.not.exist $JAVA_OPTS" /opt/jboss/container/java/run/run-java.sh $@ env: - name: BUILD_SCRIPT value: $(params.BUILD_SCRIPT) diff --git a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go index 69f2aaa89..ae07f6220 100644 --- a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go +++ b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go @@ -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/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml" + KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/UNSHARE/deploy/tasks/pre-build.yaml" KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build-git.yaml" KonfluxBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml" KonfluxDeployDefinitions = "https://raw.githubusercontent.com/ruhan1/jvm-build-service/main-uploadlog/deploy/tasks/push-results.yaml"