add generic image to params and release ci

Signed-off-by: Humair Khan <[email protected]>

Author: HumairAK

.github/scripts/release_prep/create_branches.sh

@@ -18,7 +18,21 @@ git clone \
   --branch=master \
   https://${GH_USER_NAME}:${GH_TOKEN}@github.com/${DSP_REPOSITORY_FULL} \
   ${DSP_DIR}
-cd ${DSP_DIR}
+pushd ${DSP_DIR}
 git checkout -B ${MINOR_RELEASE_BRANCH}
 git push origin ${MINOR_RELEASE_BRANCH}
 echo "::notice:: Created DSP ${MINOR_RELEASE_BRANCH} branch"
+popd
+
+echo "Current branches in ${DSP_PIPELINES_REPOSITORY_FULL}"
+DSP_PIPELINES_DIR=$(dirname ${WORKING_DIR})/ilab-on-ocp
+git clone \
+  --depth=1 \
+  --branch=master \
+  https://${GH_USER_NAME}:${GH_TOKEN}@github.com/${DSP_PIPELINES_REPOSITORY_FULL} \
+  ${DSP_PIPELINES_DIR}
+pushd ${DSP_PIPELINES_DIR}
+git checkout -B ${MINOR_RELEASE_BRANCH}
+git push origin ${MINOR_RELEASE_BRANCH}
+echo "::notice:: Created DSP Pipelines ${MINOR_RELEASE_BRANCH} branch"
+popd

.github/workflows/build-tags.yml

@@ -13,6 +13,11 @@ on:
         default: 'v1.0.x'
         description: 'Source branch to build DSP from'
         required: true
+      src_pipelines_branch:
+        type: string
+        default: 'v1.0.x'
+        description: 'Source branch to build DSP Pipelines Generic Image from'
+        required: true
       target_tag:
         type: string
         default: 'vx.y.z'
@@ -28,6 +33,11 @@ on:
         default: 'opendatahub-io/data-science-pipelines'
         description: 'DSP org/repo'
         required: true
+      pipelines_org_repo:
+        type: string
+        default: 'opendatahub-io/ilab-on-ocp'
+        description: 'DSP Pipelines org/repo'
+        required: true
       overwrite_imgs:
         type: string
         default: 'true'
@@ -45,6 +55,11 @@ on:
         default: 'v1.0.x'
         description: 'Source branch to build DSP from'
         required: true
+      src_pipelines_branch:
+        type: string
+        default: 'v1.0.x'
+        description: 'Source branch to build DSP Pipelines Generic Image from'
+        required: true
       target_tag:
         default: 'vx.y.z'
         description: 'Target Image Tag'
@@ -57,6 +72,11 @@ on:
         default: 'opendatahub-io/data-science-pipelines'
         description: 'DSP org/repo'
         required: true
+      pipelines_org_repo:
+        type: string
+        default: 'opendatahub-io/ilab-on-ocp'
+        description: 'DSP Pipelines org/repo'
+        required: true
       overwrite_imgs:
         type: string
         default: 'false'
@@ -70,8 +90,10 @@ env:
   IMAGE_REPO_SWF: ds-pipelines-scheduledworkflow
   IMAGE_REPO_LAUNCHER: ds-pipelines-launcher
   IMAGE_REPO_DRIVER: ds-pipelines-driver
+  IMAGE_REPO_PIELINES_RUNTIME_GENERIC: ds-pipelines-runtime-generic
   SOURCE_DSPO_BRANCH: ${{ inputs.src_dspo_branch }}
   SOURCE_DSP_BRANCH: ${{ inputs.src_dsp_branch }}
+  SOURCE_DSP_PIPELINES_BRANCH: ${{ inputs.src_pipelines_branch }}
   QUAY_ORG: ${{ inputs.quay_org }}
   QUAY_ID: ${{ secrets.QUAY_ID }}
   QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
@@ -189,3 +211,19 @@ jobs:
           DOCKERFILE: backend/Dockerfile.launcher
           GH_REPO: ${{ inputs.dsp_org_repo }}
           OVERWRITE: ${{ env.OVERWRITE_IMAGES }}
+
+  RUNTIME-GENERIC-build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/build
+        name: Build Image
+        env:
+          SOURCE_BRANCH: ${{ env.SOURCE_DSP_PIPELINES_BRANCH }}
+        with:
+          IMAGE_REPO: ${{ env.IMAGE_REPO_PIELINES_RUNTIME_GENERIC }}
+          DOCKERFILE: Dockerfile
+          GH_REPO: ${{ inputs.pipelines_org_repo }}
+          OVERWRITE: ${{ env.OVERWRITE_IMAGES }}

.github/workflows/release_prep.yaml

@@ -41,6 +41,7 @@ env:
   DSPO_REPOSITORY_FULL: ${{ inputs.gh_org }}/data-science-pipelines-operator
   DSP_REPOSITORY: data-science-pipelines
   DSP_REPOSITORY_FULL: ${{ inputs.gh_org }}/data-science-pipelines
+  DSP_PIPELINES_REPOSITORY_FULL: ${{ inputs.gh_org }}/ilab-on-ocp
   PREVIOUS_RELEASE_TAG: ${{ inputs.previous_release_tag }}
   OVERWRITE_IMAGES: ${{ inputs.overwrite_imgs }}
   CONFIG_TEMPLATE: "./.github/scripts/release_prep/templates/config.yaml"
@@ -86,6 +87,7 @@ jobs:
           MINOR_RELEASE_BRANCH: ${{ env.MINOR_RELEASE_BRANCH }}
           DSPO_REPOSITORY_FULL: ${{ env.DSPO_REPOSITORY_FULL }}
           DSP_REPOSITORY_FULL: ${{ env.DSP_REPOSITORY_FULL }}
+          DSP_PIPELINES_REPOSITORY_FULL: ${{ env.DSP_PIPELINES_REPOSITORY_FULL }}
           WORKING_DIR: ${{ github.workspace }}
         run: ./.github/scripts/release_prep/create_branches.sh
 
@@ -100,7 +102,8 @@ jobs:
       MINOR_RELEASE_BRANCH: ${{ env.MINOR_RELEASE_BRANCH }}
       MINOR_RELEASE_TAG: ${{ env.MINOR_RELEASE_TAG }}
       QUAY_ORG: ${{ env.QUAY_ORG }}
-      DSPO_GH_ORG: ${{ env.DSP_REPOSITORY_FULL }}
+      DSP_GH_ORG_REPO: ${{ env.DSP_REPOSITORY_FULL }}
+      DSP_PIPELINES_GH_ORG_REPO: ${{ env.DSP_PIPELINES_REPOSITORY_FULL }}
       OVERWRITE_IMAGES: ${{ env.OVERWRITE_IMAGES }}
     steps:
       - run: echo "Storing env vars for re-usable workflow."
@@ -113,9 +116,11 @@ jobs:
     with:
       src_dspo_branch: ${{  needs.get-env-vars.outputs.MINOR_RELEASE_BRANCH }}
       src_dsp_branch: ${{  needs.get-env-vars.outputs.MINOR_RELEASE_BRANCH }}
+      src_pipelines_branch: ${{  needs.get-env-vars.outputs.MINOR_RELEASE_BRANCH }}
       target_tag: ${{  needs.get-env-vars.outputs.MINOR_RELEASE_TAG }}
       quay_org: ${{  needs.get-env-vars.outputs.QUAY_ORG }}
-      dsp_org_repo: ${{  needs.get-env-vars.outputs.DSPO_GH_ORG }}
+      dsp_org_repo: ${{  needs.get-env-vars.outputs.DSP_GH_ORG_REPO }}
+      pipelines_org_repo: ${{ needs.get-env-vars.outputs.DSP_PIPELINES_GH_ORG_REPO }}
       overwrite_imgs: ${{  needs.get-env-vars.outputs.OVERWRITE_IMAGES }}
     secrets: inherit
 

config/base/params.env

@@ -7,10 +7,10 @@ IMAGES_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcon
 IMAGES_LAUNCHER=quay.io/opendatahub/ds-pipelines-launcher:latest
 IMAGES_DRIVER=quay.io/opendatahub/ds-pipelines-driver:latest
 IMAGES_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
+IMAGES_PIPELINESRUNTIMEGENERIC=hukhan/ds-pipelines-runtime-generic:latest
 IMAGES_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:b30d60cd458133430d4c92bf84911e03cecd02f60e88a58d1c6c003543cf833a
 IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:f0ee0d27bb784e289f7d88cc8ee0e085ca70e88a5d126562105542f259a1ac01
 IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8ce44de8c683f198bf24ba36cd17e89708153d11f5b42c0a27e77f8fdb233551
-IMAGES_PIPELINESRUNTIMEGENERIC=TBD
 ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10
 DSPO_HEALTHCHECK_DATABASE_CONNECTIONTIMEOUT=15s

scripts/release/params.py

@@ -12,6 +12,7 @@
     "IMAGES_SCHEDULEDWORKFLOW":  "ds-pipelines-scheduledworkflow",
     "IMAGES_LAUNCHER":  "ds-pipelines-launcher",
     "IMAGES_DRIVER":  "ds-pipelines-driver",
+    "IMAGES_PIPELINESRUNTIMEGENERIC":  "ds-pipelines-runtime-generic",
 }
 
 TAGGED_REPOS = {