update after review

Signed-off-by: 27149chen <[email protected]>
IBM · Apr 3, 2019 · aa2bc31 · aa2bc31
1 parent 78eadb9
commit aa2bc31
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/ci/helper_to_push_ubiquity_images_and_manifests.sh b/scripts/ci/helper_to_push_ubiquity_images_and_manifests.sh
@@ -53,15 +53,15 @@ ubiquity_db_envs="in_UBIQUITY_DB_IMAGE_AMD64 out_UBIQUITY_DB_IMAGE_AMD64 in_UBIQ
 ubiquity_provisioner_envs="in_UBIQUITY_K8S_PROVISIONER_IMAGE_AMD64 out_UBIQUITY_K8S_PROVISIONER_IMAGE_AMD64 in_UBIQUITY_K8S_PROVISIONER_IMAGE_PPC64LE out_UBIQUITY_K8S_PROVISIONER_IMAGE_PPC64LE in_UBIQUITY_K8S_PROVISIONER_IMAGE_S390X out_UBIQUITY_K8S_PROVISIONER_IMAGE_S390X out_UBIQUITY_K8S_PROVISIONER_IMAGE_MULTIARCH"
 ubiquity_flex_envs="in_UBIQUITY_K8S_FLEX_IMAGE_AMD64 out_UBIQUITY_K8S_FLEX_IMAGE_AMD64 in_UBIQUITY_K8S_FLEX_IMAGE_PPC64LE out_UBIQUITY_K8S_FLEX_IMAGE_PPC64LE in_UBIQUITY_K8S_FLEX_IMAGE_S390X out_UBIQUITY_K8S_FLEX_IMAGE_S390X out_UBIQUITY_K8S_FLEX_IMAGE_MULTIARCH"
 ubiquity_flex_sidecar_envs="in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_AMD64 out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_AMD64 in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_PPC64LE out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_PPC64LE in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_S390X out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_S390X out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_MULTIARCH"
-ubiquity_helm_envs="in_UBIQUITY_K8S_HELM_IMAGE_AMD64 out_UBIQUITY_K8S_HELM_IMAGE_AMD64 in_UBIQUITY_K8S_HELM_IMAGE_PPC64LE out_UBIQUITY_K8S_HELM_IMAGE_PPC64LE in_UBIQUITY_K8S_HELM_IMAGE_S390X out_UBIQUITY_K8S_HELM_IMAGE_S390X out_UBIQUITY_K8S_HELM_IMAGE_MULTIARCH"
+ubiquity_helm_utils_envs="in_UBIQUITY_K8S_HELM_UTILS_IMAGE_AMD64 out_UBIQUITY_K8S_HELM_UTILS_IMAGE_AMD64 in_UBIQUITY_K8S_HELM_UTILS_IMAGE_PPC64LE out_UBIQUITY_K8S_HELM_UTILS_IMAGE_PPC64LE in_UBIQUITY_K8S_HELM_UTILS_IMAGE_S390X out_UBIQUITY_K8S_HELM_UTILS_IMAGE_S390X out_UBIQUITY_K8S_HELM_UTILS_IMAGE_MULTIARCH"
 
 HELPER_PUSH_IMAGE=./helper_to_push_docker_image.sh
 HELPER_PUSH_MANIFEST=./helper_to_push_docker_manifest.sh
 
 date
 # Validations
 [ -f $HELPER_PUSH_IMAGE -a -f $HELPER_PUSH_MANIFEST ]  && : || exit 1
-for expected_env in $ubiquity_envs $ubiquity_db_envs $ubiquity_provisioner_envs $ubiquity_flex_envs $ubiquity_flex_sidecar_envs $ubiquity_helm_envs; do
+for expected_env in $ubiquity_envs $ubiquity_db_envs $ubiquity_provisioner_envs $ubiquity_flex_envs $ubiquity_flex_sidecar_envs $ubiquity_helm_utils_envs; do
    [ -z "`printenv $expected_env`" ] && { echo "Error: expected env [$expected_env] does not exist. Please set it first."; exit 1; } || :
    echo "$expected_env=`printenv $expected_env`"
 done
@@ -74,7 +74,7 @@ push_arch_images_and_create_manifest_for_app "Ubiquity DB"            $in_UBIQUI
 push_arch_images_and_create_manifest_for_app "Ubiquity provisioner"   $in_UBIQUITY_K8S_PROVISIONER_IMAGE_AMD64   $out_UBIQUITY_K8S_PROVISIONER_IMAGE_AMD64          $in_UBIQUITY_K8S_PROVISIONER_IMAGE_PPC64LE   $out_UBIQUITY_K8S_PROVISIONER_IMAGE_PPC64LE          $in_UBIQUITY_K8S_PROVISIONER_IMAGE_S390X   $out_UBIQUITY_K8S_PROVISIONER_IMAGE_S390X          $out_UBIQUITY_K8S_PROVISIONER_IMAGE_MULTIARCH    $TAG_LATEST
 push_arch_images_and_create_manifest_for_app "Ubiquity flex"          $in_UBIQUITY_K8S_FLEX_IMAGE_AMD64          $out_UBIQUITY_K8S_FLEX_IMAGE_AMD64                 $in_UBIQUITY_K8S_FLEX_IMAGE_PPC64LE          $out_UBIQUITY_K8S_FLEX_IMAGE_PPC64LE                 $in_UBIQUITY_K8S_FLEX_IMAGE_S390X          $out_UBIQUITY_K8S_FLEX_IMAGE_S390X                 $out_UBIQUITY_K8S_FLEX_IMAGE_MULTIARCH           $TAG_LATEST
 push_arch_images_and_create_manifest_for_app "Ubiquity flex sidecar"  $in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_AMD64  $out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_AMD64         $in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_PPC64LE  $out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_PPC64LE         $in_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_S390X  $out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_S390X         $out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_MULTIARCH   $TAG_LATEST
-push_arch_images_and_create_manifest_for_app "Ubiquity helm utils"    $in_UBIQUITY_K8S_HELM_IMAGE_AMD64          $out_UBIQUITY_K8S_HELM_IMAGE_AMD64                 $in_UBIQUITY_K8S_HELM_IMAGE_PPC64LE          $out_UBIQUITY_K8S_HELM_IMAGE_PPC64LE                 $in_UBIQUITY_K8S_HELM_IMAGE_S390X          $out_UBIQUITY_K8S_HELM_IMAGE_S390X                 $out_UBIQUITY_K8S_HELM_IMAGE_MULTIARCH           $TAG_LATEST
+push_arch_images_and_create_manifest_for_app "Ubiquity helm utils"    $in_UBIQUITY_K8S_HELM_UTILS_IMAGE_AMD64          $out_UBIQUITY_K8S_HELM_UTILS_IMAGE_AMD64                 $in_UBIQUITY_K8S_HELM_UTILS_IMAGE_PPC64LE          $out_UBIQUITY_K8S_HELM_UTILS_IMAGE_PPC64LE                 $in_UBIQUITY_K8S_HELM_UTILS_IMAGE_S390X          $out_UBIQUITY_K8S_HELM_UTILS_IMAGE_S390X                 $out_UBIQUITY_K8S_HELM_UTILS_IMAGE_MULTIARCH           $TAG_LATEST
 
 date
 echo "######################################"
@@ -87,6 +87,6 @@ echo $out_UBIQUITY_DB_IMAGE_MULTIARCH
 echo $out_UBIQUITY_K8S_PROVISIONER_IMAGE_MULTIARCH
 echo $out_UBIQUITY_K8S_FLEX_IMAGE_MULTIARCH
 echo $out_UBIQUITY_K8S_FLEX_SIDECAR_IMAGE_MULTIARCH
-echo $out_UBIQUITY_K8S_HELM_IMAGE_MULTIARCH
+echo $out_UBIQUITY_K8S_HELM_UTILS_IMAGE_MULTIARCH