[ci] Use serving_version in nightly pipeline

Author: xyang16

.github/workflows/docker-nightly-publish.yml

@@ -28,6 +28,9 @@ on:
       djl_version:
         description: "djl version"
         value: ${{ jobs.nightly-build.outputs.djl_version }}
+      serving_version:
+        description: "djl serving version"
+        value: ${{ jobs.nightly-build.outputs.serving_version }}
 
 permissions:
   id-token: write
@@ -83,6 +86,7 @@ jobs:
       - SHA-${{ github.sha }}
     outputs:
       djl_version: ${{ steps.get-versions.outputs.DJL_VERSION }}
+      serving_version: ${{ steps.get-versions.outputs.SERVING_VERSION }}
     steps:
       - name: Clean disk space
         run: |
@@ -121,6 +125,7 @@ jobs:
           echo "DJL_VERSION=$DJL_VERSION" >> $GITHUB_ENV
           echo "DJL_VERSION=$DJL_VERSION" >> $GITHUB_OUTPUT
           echo "SERVING_VERSION=$SERVING_VERSION" >> $GITHUB_ENV
+          echo "SERVING_VERSION=$SERVING_VERSION" >> $GITHUB_OUTPUT
           mode=${{ inputs.mode }}
           if [[ "$mode" != "release" ]]; then
             export NIGHTLY="-nightly"

.github/workflows/integration.yml

@@ -3,8 +3,8 @@ name: Integration tests
 on:
   workflow_dispatch:
     inputs:
-      djl-version:
-        description: 'The released version of DJL.'
+      serving-version:
+        description: 'The released version of DJL Serving.'
         required: true
         default: ''
       tag-suffix:
@@ -19,8 +19,8 @@ on:
         default: '185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp'
   workflow_call:
     inputs:
-      djl-version:
-        description: 'The released version of DJL.'
+      serving-version:
+        description: 'The released version of DJL Serving.'
         required: false
         type: string
         default: ''
@@ -260,7 +260,7 @@ jobs:
       - name: Test
         working-directory: tests/integration
         env:
-          TEST_DJL_VERSION: ${{ inputs.djl-version }}
+          TEST_SERVING_VERSION: ${{ inputs.serving-version }}
           IMAGE_TAG_SUFFIX: ${{ inputs.tag-suffix }}
           IMAGE_REPO: ${{ inputs.image-repo }}
         run: |

.github/workflows/integration_execute.yml

@@ -20,8 +20,8 @@ on:
           - action_g6
           - action_graviton
 
-      djl-version:
-        description: 'The released version of DJL. Can be "nightly", "temp", or a DJL release version like "0.28.0"'
+      serving-version:
+        description: 'The released version of DJL Serving. Can be "nightly", "temp", or a release version like "0.35.0"'
         required: false
         default: 'temp'
 
@@ -31,7 +31,7 @@ permissions:
 
 jobs:
   build-temp:
-    if: ${{ inputs.djl-version == 'temp' }}
+    if: ${{ inputs.serving-version == 'temp' }}
     uses: ./.github/workflows/docker-nightly-publish.yml
     secrets: inherit
     with:
@@ -81,7 +81,7 @@ jobs:
           role-to-assume: arn:aws:iam::185921645874:role/github-actions-djl-serving
           aws-region: us-east-1
       - name: Login for temp
-        if: ${{ inputs.djl-version == 'temp' }}
+        if: ${{ inputs.serving-version == 'temp' }}
         run: |
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp
       - name: Install awscurl
@@ -93,7 +93,7 @@ jobs:
       - name: Test
         working-directory: tests/integration
         env:
-          TEST_DJL_VERSION: ${{ inputs.djl-version }}
+          TEST_SERVING_VERSION: ${{ inputs.serving-version }}
         run: |
           python -m pytest tests.py -k "${{ inputs.test }}"  -m "${{ inputs.mark }}"
       - name: Cleanup

.github/workflows/nightly.yml

@@ -37,7 +37,7 @@ jobs:
         uses: ./.github/workflows/integration.yml
         secrets: inherit
         with:
-            djl-version: ${{ needs.build.outputs.djl_version }}
+            serving-version: ${{ needs.build.outputs.serving_version }}
             tag-suffix: ${{ inputs.mode == 'release' && github.sha || format('{0}-{1}', 'nightly', github.sha) }}
 
 
@@ -88,7 +88,7 @@ jobs:
             - name: Get image tag
               id: get-tag
               run: |
-                  SERVING_VERSION=$(echo "${{ needs.build.outputs.djl_version }}")
+                  SERVING_VERSION=$(echo "${{ needs.build.outputs.serving_version }}")
                   mode=${{ inputs.mode }}
                   if [[ "$mode" != "release" ]]; then
                     NIGHTLY="-nightly"

.github/workflows/optimization_integration.yml

@@ -3,8 +3,8 @@ name: Optimization Integration tests
 on:
   workflow_dispatch:
     inputs:
-      djl-version:
-        description: 'The released version of DJL.'
+      serving-version:
+        description: 'The released version of DJL Serving.'
         required: true
         default: ''
       tag-suffix:
@@ -19,8 +19,8 @@ on:
         default: '185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp'
   workflow_call:
     inputs:
-      djl-version:
-        description: 'The released version of DJL.'
+      serving-version:
+        description: 'The released version of DJL Serving.'
         required: false
         type: string
         default: ''
@@ -158,7 +158,7 @@ jobs:
       - name: ECR Auth
         working-directory: tests/integration
         env:
-          TEST_DJL_VERSION: ${{ inputs.djl-version }}
+          TEST_SERVING_VERSION: ${{ inputs.serving-version }}
           IMAGE_TAG_SUFFIX: ${{ inputs.tag-suffix }}
           IMAGE_REPO: ${{ inputs.image-repo }}
         run: |

tests/integration/tests.py

@@ -11,7 +11,7 @@
 import test_client
 import time
 
-djl_version = os.environ.get('TEST_DJL_VERSION', '0.34.0').strip()
+djl_version = os.environ.get('TEST_SERVING_VERSION', '0.35.0').strip()
 override_image_tag_suffix = os.environ.get('IMAGE_TAG_SUFFIX', '').strip()
 image_repo = os.environ.get('IMAGE_REPO', '').strip()
 override_container = os.environ.get('OVERRIDE_TEST_CONTAINER', '').strip()