Skip to content

Commit 5937ace

Browse files
committed
Add custom pipeline option
1 parent cc970ca commit 5937ace

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

java-components/cli/src/test/java/com/redhat/hacbs/cli/MockOidcClient.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
import io.smallrye.mutiny.Uni;
1212

1313
/**
14-
* From <a href="https://github.com/project-ncl/build-driver/blob/main/src/test/java/org/jboss/pnc/builddriver/MockOidcClient.java">PNC BuildDriver</a>
14+
* From <a href=
15+
* "https://github.com/project-ncl/build-driver/blob/main/src/test/java/org/jboss/pnc/builddriver/MockOidcClient.java">PNC
16+
* BuildDriver</a>
1517
*/
1618
@Mock
1719
public class MockOidcClient implements OidcClient {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
quarkus:
2+
oidc:
3+
enabled: false
4+
oidc-client:
5+
enabled: false

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@
44

55
import java.io.IOException;
66
import java.nio.charset.StandardCharsets;
7+
import java.nio.file.Path;
78
import java.util.HashMap;
89
import java.util.Map;
10+
import java.util.Optional;
911

1012
import jakarta.enterprise.context.RequestScoped;
1113
import jakarta.inject.Inject;
1214

15+
import org.apache.commons.io.FileUtils;
1316
import org.apache.commons.io.IOUtils;
1417
import org.apache.commons.text.StringSubstitutor;
1518
import org.eclipse.microprofile.config.ConfigProvider;
19+
import org.eclipse.microprofile.config.inject.ConfigProperty;
1620
import org.eclipse.microprofile.rest.client.inject.RestClient;
1721
import org.slf4j.Logger;
1822
import org.slf4j.LoggerFactory;
@@ -56,6 +60,9 @@ public class Driver {
5660
@Setter
5761
private String processor = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc";
5862

63+
@ConfigProperty(name = "build-driver.pipeline")
64+
Optional<String> customPipeline;
65+
5966
public void create(BuildRequest buildRequest) {
6067
IndyTokenResponseDTO tokenResponseDTO = new IndyTokenResponseDTO(accessToken);
6168

@@ -86,8 +93,12 @@ public void create(BuildRequest buildRequest) {
8693

8794
String pipeline = "";
8895
try {
89-
pipeline = IOUtils.resourceToString("pipeline.yaml", StandardCharsets.UTF_8,
90-
Thread.currentThread().getContextClassLoader());
96+
if (customPipeline.isEmpty()) {
97+
pipeline = IOUtils.resourceToString("pipeline.yaml", StandardCharsets.UTF_8,
98+
Thread.currentThread().getContextClassLoader());
99+
} else {
100+
pipeline = FileUtils.readFileToString(Path.of(customPipeline.get()).toFile(), StandardCharsets.UTF_8);
101+
}
91102
} catch (IOException e) {
92103
// TODO: process
93104
}

0 commit comments

Comments
 (0)