[CI] Carvel: Update workflow and actions. [skip-ci]

spring-cloud · Sep 7, 2023 · 4c7e1e2 · 4c7e1e2
1 parent ebde977
commit 4c7e1e2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/.github/actions/build-package-bundle/action.yml b/.github/actions/build-package-bundle/action.yml
@@ -13,6 +13,9 @@ inputs:
   server-repository:
     description: server repository
     required: true
+  skipper-repository:
+    description: skipper repository
+    required: true
   ctr-version:
     description: ctr version
     required: true
@@ -44,6 +47,7 @@ runs:
     env:
       DATAFLOW_VERSION: ${{ inputs.dataflow-version }}
       SKIPPER_VERSION: ${{ inputs.skipper-version }}
+      SKIPPER_REPOSITORY: ${{ inputs.skipper-repository }}
       SERVER_VERSION: ${{ inputs.server-version }}
       SERVER_REPOSITORY: ${{ inputs.server-repository }}
       CTR_VERSION: ${{ inputs.ctr-version }}

diff --git a/.github/actions/build-package-bundle/build-package-bundle.sh b/.github/actions/build-package-bundle/build-package-bundle.sh
@@ -31,11 +31,12 @@ check_env SERVER_VERSION
 check_env SERVER_REPOSITORY
 check_env DATAFLOW_VERSION
 check_env SKIPPER_VERSION
+check_env SKIPPER_REPOSITORY
 check_env PACKAGE_NAME
 check_env IMGPKG_LOCK_TEMPLATE
 check_env VENDIR_SRC_IN
 
-echo "Build Package Bundle: $PACKAGE_BUNDLE_TEMPLATE package.name=$PACKAGE_NAME, server.repository=$SERVER_REPOSITORY, server.version=$SERVER_VERSION, output=$PACKAGE_BUNDLE_GENERATED"
+echo "Build Package Bundle: $PACKAGE_BUNDLE_TEMPLATE package.name=$PACKAGE_NAME, server.repository=$SERVER_REPOSITORY, server.version=$SERVER_VERSION,skipper.repository=$SKIPPER_REPOSITORY, skipper.version=$SKIPPER_VERSION, output=$PACKAGE_BUNDLE_GENERATED"
 
 set -e
 ytt -f "$PACKAGE_BUNDLE_TEMPLATE" \
@@ -45,6 +46,7 @@ ytt -f "$PACKAGE_BUNDLE_TEMPLATE" \
     --data-value-yaml ctr.version="$DATAFLOW_VERSION" \
     --data-value-yaml dataflow.version="$DATAFLOW_VERSION" \
     --data-value-yaml skipper.version="$SKIPPER_VERSION" \
+    --data-value-yaml skipper.repository="$SKIPPER_REPOSITORY" \
     --data-value-yaml grafana.version="$DATAFLOW_VERSION" \
     --data-value-yaml package.name="$PACKAGE_NAME" \
     --file-mark 'config/values.yml:type=text-template' \
@@ -57,6 +59,7 @@ ytt -f "$IMGPKG_LOCK_TEMPLATE" \
     --data-value-yaml ctr.version="$DATAFLOW_VERSION" \
     --data-value-yaml dataflow.version="$DATAFLOW_VERSION" \
     --data-value-yaml skipper.version="$SKIPPER_VERSION" \
+    --data-value-yaml skipper.repository="$SKIPPER_REPOSITORY" \
     --data-value-yaml grafana.version="$DATAFLOW_VERSION" \
     --file-mark '**/*.yml:type=text-template'
 

diff --git a/.github/workflows/carvel-worker.yml b/.github/workflows/carvel-worker.yml
@@ -41,6 +41,7 @@ jobs:
       ctr-version: ${{ needs.prepare.outputs.dataflow-version }}
       skipper-version: ${{ needs.prepare.outputs.skipper-version }}
       server-repository: 'springcloud/spring-cloud-dataflow-server'
+      skipper-repository: 'springcloud/spring-cloud-skipper-server'
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/ci-carvel.yml b/.github/workflows/ci-carvel.yml
@@ -79,6 +79,7 @@ jobs:
       package-name: 'scdf'
       package-version: ${{ needs.prepare.outputs.package-version }}
       server-repository: 'springcloud/spring-cloud-dataflow-server'
+      skipper-repository: 'springcloud/spring-cloud-skipper-server'
       package-bundle: 'springcloud/scdf-oss-package'
       repository-bundle: 'springcloud/scdf-oss-repo'
       dataflow-version: ${{ needs.prepare.outputs.dataflow-version }}

diff --git a/.github/workflows/common-carvel.yml b/.github/workflows/common-carvel.yml
@@ -39,6 +39,10 @@ on:
         type: string
         description: 'Docker repo for Data Flow Server'
         required: true
+      skipper-repository:
+        type: string
+        description: 'Docker repo for Skipper Server'
+        required: true
     secrets:
       DOCKERHUB_USERNAME:
       DOCKERHUB_TOKEN:
@@ -67,6 +71,7 @@ jobs:
       with:
         dataflow-version: ${{ inputs.dataflow-version }}
         skipper-version: ${{ inputs.skipper-version }}
+        skipper-repository: ${{ inputs.skipper-repository }}
         server-version: ${{ inputs.server-version }}
         server-repository: ${{ inputs.server-repository }}
         ctr-version: ${{ inputs.ctr-version }}