adjust OSL nightly to build offline maven repo for builder and devmod…

…e images from kubesmarts/osl-images (#54)
kiegroup · Nov 27, 2024 · 9d3e9d5 · 9d3e9d5
1 parent ee9a334
commit 9d3e9d5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.prod.nightly b/.ci/jenkins/Jenkinsfile.prod.nightly
@@ -186,8 +186,8 @@ pipeline {
 
                             def descriptorFilePath = 'packages/osl-swf-builder-image/generated/logic-swf-builder-rhel8-image.yaml'
                             // Map with artifact path required in image module.yaml
-                            def artifacts = ["${env.M2_FOLDER}/org/kie/kogito/kogito-builder-quarkus-app/${env.ARTIFACTS_VERSION}/kogito-builder-quarkus-app-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-builder-quarkus-app", target: "kogito-builder-quarkus-app-image-build.zip"],
-                                            "${env.M2_FOLDER}/org/kie/kogito/kogito-builder-maven-repository/${env.ARTIFACTS_VERSION}/kogito-builder-maven-repository-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-builder-maven-repository", target: "kogito-builder-maven-repository-image-build.zip"]
+                            def artifacts = ["${env.M2_FOLDER}/com/redhat/osl/osl-builder-quarkus-app/${env.ARTIFACTS_VERSION}/osl-builder-quarkus-app-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-builder-quarkus-app", target: "kogito-builder-quarkus-app-image-build.zip"],
+                                            "${env.M2_FOLDER}/com/redhat/osl/osl-builder-maven-repository/${env.ARTIFACTS_VERSION}/osl-builder-maven-repository-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-builder-maven-repository", target: "kogito-builder-maven-repository-image-build.zip"]
                                             ]
 
                             env.SWF_BUILDER_REGISTRY = buildImage(env.SWF_BUILDER, descriptorFilePath, env.NIGHTLY_BRANCH_NAME, artifacts, env.IMAGES_REPOSITORY_PATH)
@@ -201,8 +201,8 @@ pipeline {
 
                             def descriptorFilePath = 'packages/osl-swf-devmode-image/generated/logic-swf-devmode-rhel8-image.yaml'
                             // Map with artifact path required in image module.yaml
-                            def artifacts = ["${env.M2_FOLDER}/org/kie/kogito/kogito-devmode-quarkus-app/${env.ARTIFACTS_VERSION}/kogito-devmode-quarkus-app-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-devmode-quarkus-app", target: "kogito-devmode-quarkus-app-image-build.zip"],
-                                            "${env.M2_FOLDER}/org/kie/kogito/kogito-devmode-maven-repository/${env.ARTIFACTS_VERSION}/kogito-devmode-maven-repository-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-devmode-maven-repository", target: "kogito-devmode-maven-repository-image-build.zip"]
+                            def artifacts = ["${env.M2_FOLDER}/com/redhat/osl/osl-devmode-quarkus-app/${env.ARTIFACTS_VERSION}/osl-devmode-quarkus-app-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-devmode-quarkus-app", target: "kogito-devmode-quarkus-app-image-build.zip"],
+                                            "${env.M2_FOLDER}/com/redhat/osl/osl-devmode-maven-repository/${env.ARTIFACTS_VERSION}/osl-devmode-maven-repository-${env.ARTIFACTS_VERSION}-image-build.zip": [name: "kogito-devmode-maven-repository", target: "kogito-devmode-maven-repository-image-build.zip"]
                                             ]
 
                             env.SWF_DEVMODE_REGISTRY = buildImage(env.SWF_DEVMODE, descriptorFilePath, env.NIGHTLY_BRANCH_NAME, artifacts, env.IMAGES_REPOSITORY_PATH)

diff --git a/.ci/nightly-build-config.yaml b/.ci/nightly-build-config.yaml
@@ -50,7 +50,7 @@ build:
         ${{ env.PME_CMD }} ${{ env.PME_ALIGNMENT_PARAMS_kiegroup_kie_tools }}
         bash -c "set -o pipefail ; ${{ env.PME_BUILD_SCRIPT_kiegroup_kie_tools }} ${{ env.BUILD_MVN_OPTS }} | tee ${{ env.WORKSPACE }}/kie_tools.maven.log"
 
-  - project: kiegroup/kogito-images
+  - project: kubesmarts/osl-images
     build-command:
       downstream: |
         export MAVEN_OPTIONS="-s ${{ env.PME_MAVEN_SETTINGS_XML }}"
@@ -59,8 +59,8 @@ build:
         echo "NIGHTLY=${{ env.NIGHTLY }}"
         export NIGHTLY_DEPLOY_FOLDER="${{ env.WORKSPACE }}/deployDirectory"
         echo "NIGHTLY_DEPLOY_FOLDER=${{ env.NIGHTLY_DEPLOY_FOLDER }}"
-        ${{ env.PME_CMD }} ${{ env.PME_ALIGNMENT_PARAMS_kiegroup_kogito_images }}
-        bash -c "set -o pipefail ; ${{ env.PME_BUILD_SCRIPT_kiegroup_kogito_images }} ${{ env.BUILD_MVN_OPTS }} | tee ${{ env.WORKSPACE }}/kogito_images.maven.log"
+        ${{ env.PME_CMD }} ${{ env.PME_ALIGNMENT_PARAMS_kubesmarts_osl_images }}
+        bash -c "set -o pipefail ; ${{ env.PME_BUILD_SCRIPT_kubesmarts_osl_images }} ${{ env.BUILD_MVN_OPTS }} | tee ${{ env.WORKSPACE }}/kogito_images.maven.log"
 
   - project: kubesmarts/kie-tools
     build-command:

diff --git a/.ci/nightly-project-dependencies.yaml b/.ci/nightly-project-dependencies.yaml
@@ -20,14 +20,14 @@ dependencies:
     dependencies:
       - project: kiegroup/kogito-examples
 
-  - project: kiegroup/kogito-images
+  - project: kubesmarts/osl-images
     dependencies:
       - project: kiegroup/kie-tools
 
   - project: kubesmarts/kie-tools
     dependencies:
-      - project: kiegroup/kogito-images
+      - project: kubesmarts/osl-images
 
   - project: kiegroup/kogito-serverless-operator
     dependencies:
-      - project: kiegroup/kogito-images
+      - project: kubesmarts/osl-images