[0.35.0-dlc][ci] Use serving_version in CI

.github/workflows/docker_publish.yml

@@ -136,16 +136,16 @@ jobs:
           aws ecr get-login-password --region ${{ env.ECR_REPO_REGION }} | docker login --username AWS --password-stdin ${{ env.AWS_STAGING_ECR_REPO }}
       - name: Get DJL Version
         run: |
-          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ./gradle/libs.versions.toml)
-          echo "DJL_VERSION=$DJL_VERSION" >> $GITHUB_ENV
+          SERVING_VERSION=$(awk -F '=' '/serving / {gsub(/ ?"/, "", $2); print $2}' ./gradle/libs.versions.toml)
+          echo "SERVING_VERSION=$SERVING_VERSION" >> $GITHUB_ENV
       - name: Pull and sync to docker hub
         working-directory: serving/docker
         run: |
-          ./scripts/push_image_from_ECR.sh $DJL_VERSION deepjavalibrary/djl-serving ${{ inputs.mode }} ${{ matrix.arch }} ${{ inputs.commit_sha }}
+          ./scripts/push_image_from_ECR.sh $SERVING_VERSION deepjavalibrary/djl-serving ${{ inputs.mode }} ${{ matrix.arch }} ${{ inputs.commit_sha }}
       - name: Pull and sync to ECR
         working-directory: serving/docker
         run: |
-          ./scripts/push_image_from_ECR.sh $DJL_VERSION $AWS_STAGING_ECR_REPO ${{ inputs.mode }} ${{ matrix.arch }} ${{ inputs.commit_sha }}
+          ./scripts/push_image_from_ECR.sh $SERVING_VERSION $AWS_STAGING_ECR_REPO ${{ inputs.mode }} ${{ matrix.arch }} ${{ inputs.commit_sha }}
       - name: Clean docker env
         working-directory: serving/docker
         run: |

.github/workflows/llm_integration_p4d.yml

@@ -3,8 +3,8 @@ name: Large model integration tests with P4D and compiler optimizations
 on:
   workflow_dispatch:
     inputs:
-      djl-version:
-        description: 'The released version of DJL'
+      serving-version:
+        description: 'The released version of DJL Serving'
         required: false
         default: ''
       run_test:
@@ -49,7 +49,7 @@ jobs:
       - name: Install pip dependencies
         run: pip3 install requests "numpy<2"
       - name: Build container name
-        run: ./serving/docker/scripts/docker_name_builder.sh tensorrt-llm ${{ github.event.inputs.djl-version }}
+        run: ./serving/docker/scripts/docker_name_builder.sh tensorrt-llm ${{ github.event.inputs.serving-version }}
       - name: Download models and dockers
         working-directory: tests/integration
         run: |
@@ -108,7 +108,7 @@ jobs:
       - name: Install pip dependencies
         run: pip3 install requests "numpy<2"
       - name: Build container name
-        run: ./serving/docker/scripts/docker_name_builder.sh lmi ${{ github.event.inputs.djl-version }}
+        run: ./serving/docker/scripts/docker_name_builder.sh lmi ${{ github.event.inputs.serving-version }}
       - name: Download models and dockers
         working-directory: tests/integration
         run: |

.github/workflows/optimization_integration.yml

@@ -170,13 +170,13 @@ jobs:
       - name: "Compute Image Uri"
         id: compute-image-uri
         env:
-          TEST_DJL_VERSION: ${{ inputs.djl-version }}
+          TEST_SERVING_VERSION: ${{ inputs.serving-version }}
           IMAGE_TAG_SUFFIX: ${{ inputs.tag-suffix }}
           IMAGE_REPO: ${{ inputs.image-repo }}
           CONTAINER: "lmi"
         run: |
-          DJL_VERSION=${TEST_DJL_VERSION:-"0.34.0"}
-          DJL_VERSION=$(echo $DJL_VERSION | xargs) # trim whitespace
+          SERVING_VERSION=${TEST_SERVING_VERSION:-"0.35.0"}
+          SERVING_VERSION=$(echo $SERVING_VERSION | xargs) # trim whitespace
 
           if [ -n "$OVERRIDE_TEST_CONTAINER" ]; then
             TEST_IMAGE_URI=$OVERRIDE_TEST_CONTAINER
@@ -186,7 +186,7 @@ jobs:
                 echo "Error: You must set the docker image repo via IMAGE_REPO environment variable. Ex: deepjavalibrary/djl-serving" >&2
                 exit 1
             fi
-            CONTAINER_TAG="${DJL_VERSION}-${CONTAINER}"
+            CONTAINER_TAG="${SERVING_VERSION}-${CONTAINER}"
             if [ -n "$IMAGE_TAG_SUFFIX" ]; then
                 CONTAINER_TAG="${CONTAINER_TAG}-${IMAGE_TAG_SUFFIX}"
             fi

.github/workflows/serving-publish.yml

@@ -42,30 +42,30 @@ jobs:
         if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'snapshot' }}
         run: |
           ./gradlew :serving:createDeb -Psnapshot
-          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
+          SERVING_VERSION=$(awk -F '=' '/serving / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
           aws s3 cp serving/build/distributions/*.deb s3://djl-ai/publish/djl-serving/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${DJL_VERSION}*"
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${SERVING_VERSION}*"
       - name: Copy serving release artifacts to S3
         if: ${{ github.event.inputs.mode == 'staging' }}
         run: |
           ./gradlew :serving:dZ :serving:createDeb -Pstaging
-          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
+          SERVING_VERSION=$(awk -F '=' '/serving / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
           aws s3 cp serving/build/distributions/*.deb s3://djl-ai/publish/djl-serving/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${DJL_VERSION}*"
-          if [[ $(aws s3 ls s3://djl-ai/publish/djl-serving/serving-$DJL_VERSION.tar | wc -l) -eq 0 ]]; \
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${SERVING_VERSION}*"
+          if [[ $(aws s3 ls s3://djl-ai/publish/djl-serving/serving-$SERVING_VERSION.tar | wc -l) -eq 0 ]]; \
             then aws s3 cp serving/build/distributions/*.tar s3://djl-ai/publish/djl-serving/; \
             else echo serving tarball published already!; fi
           aws s3 cp serving/build/distributions/*.zip s3://djl-ai/publish/djl-serving/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/serving-${DJL_VERSION}*"
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/serving-${SERVING_VERSION}*"
       - name: Copy benchmark release artifacts to S3
         if: ${{ github.event.inputs.mode == 'staging' }}
         run: |
           ./gradlew :benchmark:dZ :benchmark:createDeb -Pstaging
-          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
-          aws s3 cp benchmark/build/distributions/*.tar s3://djl-ai/publish/djl-bench/${DJL_VERSION}/
-          aws s3 cp benchmark/build/distributions/*.deb s3://djl-ai/publish/djl-bench/${DJL_VERSION}/
-          aws s3 cp benchmark/build/distributions/*.zip s3://djl-ai/publish/djl-bench/${DJL_VERSION}/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-bench/${DJL_VERSION}/*"
+          SERVING_VERSION=$(awk -F '=' '/serving / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
+          aws s3 cp benchmark/build/distributions/*.tar s3://djl-ai/publish/djl-bench/${SERVING_VERSION}/
+          aws s3 cp benchmark/build/distributions/*.deb s3://djl-ai/publish/djl-bench/${SERVING_VERSION}/
+          aws s3 cp benchmark/build/distributions/*.zip s3://djl-ai/publish/djl-bench/${SERVING_VERSION}/
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-bench/${SERVING_VERSION}/*"
       - name: Copy awscurl snapshot artifacts to S3
         if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'snapshot' }}
         run: |
@@ -76,9 +76,9 @@ jobs:
         if: ${{ github.event.inputs.mode == 'staging' }}
         run: |
           ./gradlew :awscurl:jar -Pstaging
-          DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
-          aws s3 cp awscurl/build/awscurl s3://djl-ai/publish/awscurl/${DJL_VERSION}/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/awscurl/${DJL_VERSION}/*"
+          SERVING_VERSION=$(awk -F '=' '/serving / {gsub(/ ?"/, "", $2); print $2}' gradle/libs.versions.toml)
+          aws s3 cp awscurl/build/awscurl s3://djl-ai/publish/awscurl/${SERVING_VERSION}/
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/awscurl/${SERVING_VERSION}/*"
       - name: Publish to snapshot repository
         if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'snapshot' }}
         run: ./gradlew publish -Psnapshot --refresh-dependencies

serving/docker/dockerd-entrypoint-with-cuda-compat.sh

@@ -30,7 +30,7 @@ if [ -f /usr/local/cuda/compat/libcuda.so.1 ]; then
   fi
 else
   echo "Skip CUDA compat libs setup as package not found"
-  if [ -n "$TEST_DJL_VERSION" ]; then
+  if [ -n "$TEST_SERVING_VERSION" ]; then
     echo "Error: CUDA compat libs not found"
     exit 1
   fi

tests/integration/tests.py

@@ -8,7 +8,7 @@
 import llm.client as client
 import time
 
-djl_version = os.environ.get("TEST_SERVING_VERSION", "0.35.0").strip()
+serving_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()
@@ -41,7 +41,7 @@ def __init__(self, container, test_name=None, download=False):
                 raise ValueError(
                     "You must set the docker image repo via IMAGE_REPO environment variable."
                     " Ex: deepjavalibrary/djl-serving")
-            container_tag = f"{djl_version}-{container}"
+            container_tag = f"{serving_version}-{container}"
             if len(override_image_tag_suffix) > 0:
                 container_tag = f"{container_tag}-{override_image_tag_suffix}"
             self.image = f"{image_repo}:{container_tag}"