Skip to content

Commit 3747806

Browse files
committed
Add requestProcessor parameter
1 parent 768f0e2 commit 3747806

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

java-components/cli/src/main/java/com/redhat/hacbs/cli/driver/Pipeline.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ public class Pipeline extends Base implements Runnable {
2121
@Inject
2222
Driver driver;
2323

24-
@CommandLine.Option(names = "-q", description = "Quay repo", defaultValue = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc")
24+
@CommandLine.Option(names = "--quay", description = "Quay repo", defaultValue = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc")
2525
String quayRepo;
2626

27+
@CommandLine.Option(names = "--processor", description = "Request Process Image", defaultValue = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest")
28+
String processor;
29+
2730
@ActivateRequestContext // https://github.com/quarkusio/quarkus/issues/8758
2831
@Override
2932
public void run() {
3033
logger.info("### in here with driver {}", driver);
31-
driver.addValues(accessToken.orElse("NO_TOKEN"), quayRepo);
34+
driver.addValues(accessToken.orElse(""), quayRepo, processor);
3235

3336
BuildRequest request = BuildRequest.builder()
3437
.namespace(namespace)

java-components/driver/src/main/java/com/redhat/hacbs/driver/Driver.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ public class Driver {
4747

4848
private String accessToken;
4949
private String quayRepo;
50+
private String processor;
5051

51-
public void addValues(String accessToken, String quayRepo) {
52+
public void addValues(String accessToken, String quayRepo, String processor) {
5253
this.accessToken = accessToken;
5354
this.quayRepo = quayRepo;
55+
this.processor = processor;
5456
}
5557

5658
public void create(BuildRequest buildRequest) throws IOException {
@@ -63,6 +65,7 @@ public void create(BuildRequest buildRequest) throws IOException {
6365
}
6466

6567
Map<String, String> templateProperties = new HashMap<>();
68+
templateProperties.put("REQUEST_PROCESSOR", processor);
6669
templateProperties.put("QUAY_REPO", quayRepo);
6770
templateProperties.put("URL", buildRequest.getScmUrl());
6871
templateProperties.put("REVISION", buildRequest.getScmRevision());
@@ -93,7 +96,9 @@ public void create(BuildRequest buildRequest) throws IOException {
9396
* @return fresh access token
9497
*/
9598
public String getFreshAccessToken() {
96-
return oidcClient.getTokens().await().indefinitely().getAccessToken();
99+
var result = oidcClient.getTokens().await().indefinitely().getAccessToken();
100+
System.err.println("### result " + result);
101+
return result;
97102
}
98103

99104
private <T> T createModelNode(String resourceDefinition, Map<String, String> properties, Class<T> clazz) {

java-components/driver/src/main/resources/pipeline.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ spec:
7070
- name: ENABLE_INDY_PROXY
7171
value: "false"
7272
- name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
73-
value: "quay.io/ncross/hacbs-jvm-build-request-processor:latest"
74-
# "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest"
73+
value: "%{REQUEST_PROCESSOR}"
7574
# TODO: Should PNC set both limits and requests? See
7675
# https://home.robusta.dev/blog/kubernetes-memory-limit
7776
# https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/

0 commit comments

Comments
 (0)