Merge branch 'main' into 63-orchestrator-statefull-netapp-support

5G-ERA · Mar 15, 2024 · f7fedad · f7fedad
2 parents ae0754c + 1dd1ce0
commit f7fedad
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/centralapi_docker_tag.yml b/.github/workflows/centralapi_docker_tag.yml
@@ -36,7 +36,7 @@ jobs:
           docker tag $ECR_REPOSITORY $IMAGE_ID:$IMAGE_TAG
           docker push $IMAGE_ID:$IMAGE_TAG
 
-          if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+          if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
           fi
diff --git a/.github/workflows/gateway_docker_tag.yml b/.github/workflows/gateway_docker_tag.yml
@@ -36,7 +36,7 @@ jobs:
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')          
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG    
-        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi

diff --git a/.github/workflows/orchestrator_docker_tag.yml b/.github/workflows/orchestrator_docker_tag.yml
@@ -37,7 +37,7 @@ jobs:
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG
         
-        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* && ${{ steps.get-version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi

diff --git a/.github/workflows/redis_interface_docker_build_tag.yml b/.github/workflows/redis_interface_docker_build_tag.yml
@@ -36,7 +36,7 @@ jobs:
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')          
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG
-        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi

diff --git a/.github/workflows/resource_planner_docker_tag.yml b/.github/workflows/resource_planner_docker_tag.yml
@@ -36,7 +36,7 @@ jobs:
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')          
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG
-        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi
diff --git a/.github/workflows/task_planner_docker_build_tag.yml b/.github/workflows/task_planner_docker_build_tag.yml
@@ -36,7 +36,7 @@ jobs:
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')          
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG
-        if [[ ${{ steps.get-version.outputs.VERSION }} != *rc* ]] && [[ ${{ steps.get-version.outputs.VERSION }} != *beta* ]]; then
+        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi