Merge pull request #38 from rgdoliveira/SRVLOGIC-486

[SRVLOGIC-486] adjust modules that download prod artifacts for OSL images
kubesmarts · Dec 4, 2024 · 4313b72 · 4313b72
2 parents 1c14677 + 3c40d0d
commit 4313b72
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 53 deletions.
diff --git a/...ges/osl-data-index-ephemeral-image/generated/modules/osl-data-index-ephemeral/module.yaml b/...ges/osl-data-index-ephemeral-image/generated/modules/osl-data-index-ephemeral/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.dataindex-ephemeral
 version: "main"
 
 artifacts:
-  - name: data-index-service-inmemory
-    description: "data-index-service-inmemory-9.102.0.redhat-00004-image-build.zip"
+  - name: data-index-service-inmemory-image-build.zip
+    description: "data-index-service-inmemory-9.102.0.redhat-00004-image-build"
     md5: "8cf4a238679da32f22d68d75aecc6054"
-    target: data-index-service-inmemory-image-build.zip
 
 execute:
   - script: configure

diff --git a/...ges/osl-data-index-ephemeral-image/resources/modules/osl-data-index-ephemeral/module.yaml b/...ges/osl-data-index-ephemeral-image/resources/modules/osl-data-index-ephemeral/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.dataindex-ephemeral
 version: "main"
 
 artifacts:
-  - name: data-index-service-inmemory
-    description: "data-index-service-inmemory-9.102.0.redhat-00004-image-build.zip"
+  - name: data-index-service-inmemory-image-build.zip
+    description: "data-index-service-inmemory-9.102.0.redhat-00004-image-build"
     md5: "8cf4a238679da32f22d68d75aecc6054"
-    target: data-index-service-inmemory-image-build.zip
 
 execute:
   - script: configure

diff --git a/...s/osl-data-index-postgresql-image/generated/modules/osl-data-index-postgresql/module.yaml b/...s/osl-data-index-postgresql-image/generated/modules/osl-data-index-postgresql/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.dataindex-postgresql
 version: "main"
 
 artifacts:
-  - name: data-index-service-postgresql
-    description: "data-index-service-postgresql-9.102.0.redhat-00004-image-build.zip"
+  - name: data-index-service-postgresql-image-build.zip
+    description: "data-index-service-postgresql-9.102.0.redhat-00004-image-build"
     md5: "9fdcabfae89321d4ebdf4fc34e50061b"
-    target: data-index-service-postgresql-image-build.zip
 
 execute:
   - script: configure
diff --git a/...s/osl-data-index-postgresql-image/resources/modules/osl-data-index-postgresql/module.yaml b/...s/osl-data-index-postgresql-image/resources/modules/osl-data-index-postgresql/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.dataindex-postgresql
 version: "main"
 
 artifacts:
-  - name: data-index-service-postgresql
-    description: "data-index-service-postgresql-9.102.0.redhat-00004-image-build.zip"
+  - name: data-index-service-postgresql-image-build.zip
+    description: "data-index-service-postgresql-9.102.0.redhat-00004-image-build"
     md5: "9fdcabfae89321d4ebdf4fc34e50061b"
-    target: data-index-service-postgresql-image-build.zip
 
 execute:
   - script: configure
diff --git a/packages/osl-images-modules/resources/scripts/update_artifact.py b/packages/osl-images-modules/resources/scripts/update_artifact.py
@@ -7,7 +7,7 @@
 
 def find_artifact_by_name(artifacts, file_name_suffix):
     for artifact in artifacts:
-        if artifact.get('name') and artifact['name'] in file_name_suffix:
+        if file_name_suffix in artifact.get('name') and artifact['name']:
             return artifact
     return None
 

diff --git a/...osl-jobs-service-ephemeral-image/generated/modules/osl-jobs-service-ephemeral/module.yaml b/...osl-jobs-service-ephemeral-image/generated/modules/osl-jobs-service-ephemeral/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.jobs-service-ephemeral
 version: "main"
 
 artifacts:
-  - name: jobs-service-inmemory
-    description: "jobs-service-inmemory-9.102.0.redhat-00004-image-build.zip"
+  - name: jobs-service-inmemory-image-build.zip
+    description: "jobs-service-inmemory-9.102.0.redhat-00004-image-build"
     md5: "ad090d1f9f12dde67f8022aaeb68d745"
-    target: jobs-service-inmemory-image-build.zip
 
 packages:
   install:

diff --git a/...osl-jobs-service-ephemeral-image/resources/modules/osl-jobs-service-ephemeral/module.yaml b/...osl-jobs-service-ephemeral-image/resources/modules/osl-jobs-service-ephemeral/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.jobs-service-ephemeral
 version: "main"
 
 artifacts:
-  - name: jobs-service-inmemory
-    description: "jobs-service-inmemory-9.102.0.redhat-00004-image-build.zip"
+  - name: jobs-service-inmemory-image-build.zip
+    description: "jobs-service-inmemory-9.102.0.redhat-00004-image-build"
     md5: "ad090d1f9f12dde67f8022aaeb68d745"
-    target: jobs-service-inmemory-image-build.zip
 
 packages:
   install:

diff --git a/...l-jobs-service-postgresql-image/generated/modules/osl-jobs-service-postgresql/module.yaml b/...l-jobs-service-postgresql-image/generated/modules/osl-jobs-service-postgresql/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.jobs-service-postgresql
 version: "main"
 
 artifacts:
-  - name: jobs-service-postgresql
-    description: "jobs-service-postgresql-9.102.0.redhat-00004-image-build.zip"
+  - name: jobs-service-postgresql-image-build.zip
+    description: "jobs-service-postgresql-9.102.0.redhat-00004-image-build"
     md5: "87ca8142a52adc4e9f4fa20c821e2c74"
-    target: jobs-service-postgresql-image-build.zip
 
 packages:
   install:

diff --git a/...l-jobs-service-postgresql-image/resources/modules/osl-jobs-service-postgresql/module.yaml b/...l-jobs-service-postgresql-image/resources/modules/osl-jobs-service-postgresql/module.yaml
@@ -21,10 +21,9 @@ name: com.redhat.osl.jobs-service-postgresql
 version: "main"
 
 artifacts:
-  - name: jobs-service-postgresql
-    description: "jobs-service-postgresql-9.102.0.redhat-00004-image-build.zip"
+  - name: jobs-service-postgresql-image-build.zip
+    description: "jobs-service-postgresql-9.102.0.redhat-00004-image-build"
     md5: "87ca8142a52adc4e9f4fa20c821e2c74"
-    target: jobs-service-postgresql-image-build.zip
 
 packages:
   install:

diff --git a/packages/osl-management-console-image/generated/modules/osl-management-console/module.yaml b/packages/osl-management-console-image/generated/modules/osl-management-console/module.yaml
@@ -30,8 +30,7 @@ envs:
     value: 8080
 
 artifacts:
-  - name: sonataflow-management-console-webapp
+  - name: sonataflow-management-console-webapp-image-build.zip
     description: "sonataflow-management-console-webapp-9.102.0.redhat-00004-image-build"
     dest: /home/kogito/management-console/app
-    target: sonataflow-management-console-webapp-image-build.zip
     md5: "e1dd25a794ed2bf92f010437dc65eed6"
diff --git a/packages/osl-management-console-image/resources/modules/osl-management-console/module.yaml b/packages/osl-management-console-image/resources/modules/osl-management-console/module.yaml
@@ -30,8 +30,7 @@ envs:
     value: 8080
 
 artifacts:
-  - name: sonataflow-management-console-webapp
+  - name: sonataflow-management-console-webapp-image-build.zip
     description: "sonataflow-management-console-webapp-9.102.0.redhat-00004-image-build"
     dest: /home/kogito/management-console/app
-    target: sonataflow-management-console-webapp-image-build.zip
     md5: "e1dd25a794ed2bf92f010437dc65eed6"
diff --git a/packages/osl-swf-builder-image/generated/modules/osl-swf-builder-runtime/module.yaml b/packages/osl-swf-builder-image/generated/modules/osl-swf-builder-runtime/module.yaml
@@ -22,14 +22,12 @@ version: "main"
 description: "OpenShift Serverless Logic builder module with required extensions"
 
 artifacts:
-  - name: kogito-builder-quarkus-app
-    description: "kogito-builder-quarkus-app-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-builder-quarkus-app-image-build.zip
+    description: "kogito-builder-quarkus-app-9.102.0.redhat-00004-image-build"
     md5: "56446e0ecf816ebf1ecc0b03c00fe5a9"
-    target: kogito-builder-quarkus-app-image-build.zip
-  - name: kogito-builder-maven-repository
-    description: "kogito-builder-maven-repository-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-builder-maven-repository-image-build.zip
+    description: "kogito-builder-maven-repository-9.102.0.redhat-00004-image-build"
     md5: "75953ad4e284b83302a8f7347cedd3a7"
-    target: kogito-builder-maven-repository-image-build.zip
 
 execute:
   - script: configure.sh
diff --git a/packages/osl-swf-builder-image/resources/modules/osl-swf-builder-runtime/module.yaml b/packages/osl-swf-builder-image/resources/modules/osl-swf-builder-runtime/module.yaml
@@ -22,14 +22,12 @@ version: "main"
 description: "OpenShift Serverless Logic builder module with required extensions"
 
 artifacts:
-  - name: kogito-builder-quarkus-app
-    description: "kogito-builder-quarkus-app-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-builder-quarkus-app-image-build.zip
+    description: "kogito-builder-quarkus-app-9.102.0.redhat-00004-image-build"
     md5: "56446e0ecf816ebf1ecc0b03c00fe5a9"
-    target: kogito-builder-quarkus-app-image-build.zip
-  - name: kogito-builder-maven-repository
-    description: "kogito-builder-maven-repository-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-builder-maven-repository-image-build.zip
+    description: "kogito-builder-maven-repository-9.102.0.redhat-00004-image-build"
     md5: "75953ad4e284b83302a8f7347cedd3a7"
-    target: kogito-builder-maven-repository-image-build.zip
 
 execute:
   - script: configure.sh
diff --git a/packages/osl-swf-devmode-image/generated/modules/osl-swf-devmode-runtime/module.yaml b/packages/osl-swf-devmode-image/generated/modules/osl-swf-devmode-runtime/module.yaml
@@ -42,14 +42,12 @@ envs:
     value: "false"
 
 artifacts:
-  - name: kogito-devmode-quarkus-app
-    description: "kogito-devmode-quarkus-app-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-devmode-quarkus-app-image-build.zip
+    description: "kogito-devmode-quarkus-app-9.102.0.redhat-00004-image-build"
     md5: "3826066b2967135dbd7bea0f50bb2105"
-    target: kogito-devmode-quarkus-app-image-build.zip
-  - name: kogito-devmode-maven-repository
-    description: "kogito-devmode-maven-repository-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-devmode-maven-repository-image-build.zip
+    description: "kogito-devmode-maven-repository-9.102.0.redhat-00004-image-build"
     md5: "750c96be4767210eb85823e43706f3b5"
-    target: kogito-devmode-maven-repository-image-build.zip
 
 execute:
   - script: configure.sh
diff --git a/packages/osl-swf-devmode-image/resources/modules/osl-swf-devmode-runtime/module.yaml b/packages/osl-swf-devmode-image/resources/modules/osl-swf-devmode-runtime/module.yaml
@@ -42,14 +42,12 @@ envs:
     value: "false"
 
 artifacts:
-  - name: kogito-devmode-quarkus-app
-    description: "kogito-devmode-quarkus-app-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-devmode-quarkus-app-image-build.zip
+    description: "kogito-devmode-quarkus-app-9.102.0.redhat-00004-image-build"
     md5: "3826066b2967135dbd7bea0f50bb2105"
-    target: kogito-devmode-quarkus-app-image-build.zip
-  - name: kogito-devmode-maven-repository
-    description: "kogito-devmode-maven-repository-9.102.0.redhat-00004-image-build.zip"
+  - name: kogito-devmode-maven-repository-image-build.zip
+    description: "kogito-devmode-maven-repository-9.102.0.redhat-00004-image-build"
     md5: "750c96be4767210eb85823e43706f3b5"
-    target: kogito-devmode-maven-repository-image-build.zip
 
 execute:
   - script: configure.sh