feat: map EXHORT additional environment variables (#10)

* feat: map EXHORT_DEBUG + PYTHON pip new env variables to java properties Signed-off-by: Zvi Grinberg <[email protected]> * fix: add EXHORT_DEV_MODE flag to enable testing staging env Signed-off-by: Zvi Grinberg <[email protected]> * chore: bump exhort-java-api version to Release 0.0.5 Signed-off-by: Zvi Grinberg <[email protected]> --------- Signed-off-by: Zvi Grinberg <[email protected]>
jenkinsci · Feb 6, 2024 · 76f0613 · 76f0613
1 parent c358a43
commit 76f0613
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>com.redhat.exhort</groupId>
             <artifactId>exhort-java-api</artifactId>
-            <version>0.0.4</version>
+            <version>0.0.5</version>
         </dependency>
     </dependencies>
 

diff --git a/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.jar b/repository/com/redhat/exhort/exhort-java-api/0.0.4/exhort-java-api-0.0.4.jar
diff --git a/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.jar b/repository/com/redhat/exhort/exhort-java-api/0.0.5/exhort-java-api-0.0.5.jar
diff --git a/...-java-api/0.0.4/exhort-java-api-0.0.4.pom → ...-java-api/0.0.5/exhort-java-api-0.0.5.pom b/...-java-api/0.0.4/exhort-java-api-0.0.4.pom → ...-java-api/0.0.5/exhort-java-api-0.0.5.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.redhat.exhort</groupId>
   <artifactId>exhort-java-api</artifactId>
-  <version>0.0.4</version>
+  <version>0.0.5</version>
   <name>Exhort Java API</name>
   <description>Exhort Java API</description>
   <url>https://github.com/RHEcosystemAppEng/exhort-java-api#readme</url>
@@ -28,7 +28,7 @@
   <scm>
     <connection>scm:git:[email protected]:RHEcosystemAppEng/exhort-java-api.git</connection>
     <developerConnection>scm:git:[email protected]:RHEcosystemAppEng/exhort-java-api.git</developerConnection>
-    <tag>v0.0.4</tag>
+    <tag>v0.0.5</tag>
     <url>https://github.com/RHEcosystemAppEng/exhort-java-api</url>
   </scm>
   <dependencies>

diff --git a/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java b/src/main/java/redhat/jenkins/plugins/rhda/step/CRDAStep.java
@@ -49,6 +49,7 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
 public final class CRDAStep extends Step {
     private String file;
@@ -99,7 +100,6 @@ protected Execution(CRDAStep step, StepContext context) {
             try {
             	EnvVars envVars = context.get(EnvVars.class);
             	jenkinsPath = envVars.get("PATH");
-
                 // setting system properties to pass to java-api
                 if(envVars.get("EXHORT_MVN_PATH") != null ){
                     System.setProperty("EXHORT_MVN_PATH", envVars.get("EXHORT_MVN_PATH"));
@@ -128,6 +128,12 @@ protected Execution(CRDAStep step, StepContext context) {
                 else{
                     System.clearProperty("EXHORT_URL");
                 }
+                if(envVars.get("EXHORT_DEV_MODE") != null ){
+                    System.setProperty("EXHORT_DEV_MODE", envVars.get("EXHORT_DEV_MODE"));
+                }
+                else{
+                    System.clearProperty("EXHORT_DEV_MODE");
+                }
 
                 if(envVars.get("EXHORT_SNYK_TOKEN") != null ){
                     System.setProperty("EXHORT_SNYK_TOKEN", envVars.get("EXHORT_SNYK_TOKEN"));
@@ -177,6 +183,24 @@ protected Execution(CRDAStep step, StepContext context) {
                 else{
                     System.clearProperty("EXHORT_OSS_INDEX_TOKEN");
                 }
+                if(envVars.get("EXHORT_PIP_SHOW") != null ){
+                    System.setProperty("EXHORT_PIP_SHOW", envVars.get("EXHORT_PIP_SHOW"));
+                }
+                else{
+                    System.clearProperty("EXHORT_PIP_SHOW");
+                }
+                if(envVars.get("EXHORT_PIP_FREEZE") != null ){
+                    System.setProperty("EXHORT_PIP_FREEZE", envVars.get("EXHORT_PIP_FREEZE"));
+                }
+                else{
+                    System.clearProperty("EXHORT_PIP_FREEZE");
+                }
+                if(envVars.get("EXHORT_DEBUG") != null ){
+                    System.setProperty("EXHORT_DEBUG", envVars.get("EXHORT_DEBUG"));
+                }
+                else{
+                    System.clearProperty("EXHORT_DEBUG");
+                }
 
                 String crdaUuid;
                 RHDAGlobalConfig globalConfig = RHDAGlobalConfig.get();