[System Tests] Don't skip helm chart patching (#1068)

.github/workflows/system-tests-enterprise.yml

@@ -33,6 +33,9 @@ on:
         description: 'Clean resources created by test (like project) in each test teardown (default: true - perform clean)'
         required: true
         default: 'true'
+      override_iguazio_version:
+        description: 'Override the configured target system iguazio version (leave empty to resolve automatically by the mlrun version)'
+        required: false
 
 jobs:
   run-system-tests-enterprise-ci:
@@ -113,6 +116,10 @@ jobs:
         echo "::set-output name=mlrun_system_tests_clean_resources::$( \
           input_system_tests_clean_resources=${{ github.event.inputs.clean_resources_in_teardown }} && \
           echo ${input_system_tests_clean_resources:-true})"
+        echo "::set-output name=iguazio_version::$( \
+          override_iguazio_version=${{ github.event.inputs.override_iguazio_version }} && \
+          iguazio_version_by_branch=`if [ "0.6.x" = "0.5.x" ]; then echo "2.10_b81_20200903195924"; else echo "3.0_b27_20210205135416"; fi` && \
+          resolved_iguazio_version=${override_iguazio_version:-$iguazio_version_by_branch} && echo $resolved_iguazio_version)"
     - name: Wait for existing runs to complete
       uses: softprops/turnstyle@v1
       with:
@@ -133,6 +140,7 @@ jobs:
           "${{ secrets.V06_SYSTEM_TEST_FRAMESD_URL }}" \
           "${{ secrets.V06_SYSTEM_TEST_USERNAME }}" \
           "${{ secrets.V06_SYSTEM_TEST_ACCESS_KEY }}" \
+          "${{ steps.computed_params.outputs.iguazio_version }}" \
           "${{ secrets.V06_SYSTEM_TEST_PASSWORD }}" \
           --mlrun-commit "${{ steps.computed_params.outputs.mlrun_hash }}" \
           --override-image-registry "${{ steps.computed_params.outputs.mlrun_docker_registry }}" \
@@ -153,6 +161,7 @@ jobs:
           "${{ secrets.V05_SYSTEM_TEST_WEBAPI_DIRECT_URL }}" \
           "${{ secrets.V05_SYSTEM_TEST_USERNAME }}" \
           "${{ secrets.V05_SYSTEM_TEST_ACCESS_KEY }}" \
+          "${{ steps.computed_params.outputs.iguazio_version }}" \
           "${{ secrets.V05_SYSTEM_TEST_PASSWORD }}" \
           --mlrun-commit "${{ steps.computed_params.outputs.mlrun_hash }}" \
           --override-image-registry "${{ steps.computed_params.outputs.mlrun_docker_registry }}" \

automation/system_test/prepare.py

@@ -45,6 +45,7 @@ def __init__(
         framesd_url: str,
         username: str,
         access_key: str,
+        iguazio_version: str,
         password: str = None,
         debug: bool = False,
     ):
@@ -63,6 +64,7 @@ def __init__(
         self._data_cluster_ssh_password = data_cluster_ssh_password
         self._app_cluster_ssh_password = app_cluster_ssh_password
         self._github_access_token = github_access_token
+        self._iguazio_version = iguazio_version
 
         self._env_config = {
             "MLRUN_DBPATH": mlrun_dbpath,
@@ -351,6 +353,7 @@ def _patch_mlrun(self, provctl_path):
                 "create-patch",
                 "appservice",
                 override_image_arg,
+                f"--target-iguazio-version={str(self._iguazio_version)}",
                 "mlrun",
                 self._mlrun_version,
                 mlrun_archive,
@@ -370,8 +373,6 @@ def _patch_mlrun(self, provctl_path):
                 "appservice",
                 "mlrun",
                 mlrun_archive,
-                # TODO: remove when 0.6.0 is out
-                "--skip-chart-patching",
             ],
         )
 
@@ -416,6 +417,7 @@ def main():
 @click.argument("framesd-url", type=str, required=True)
 @click.argument("username", type=str, required=True)
 @click.argument("access-key", type=str, required=True)
+@click.argument("iguazio-version", type=str, default=None, required=True)
 @click.argument("password", type=str, default=None, required=False)
 @click.option(
     "--debug",
@@ -438,6 +440,7 @@ def run(
     framesd_url: str,
     username: str,
     access_key: str,
+    iguazio_version: str,
     password: str,
     debug: bool,
 ):
@@ -456,6 +459,7 @@ def run(
         framesd_url,
         username,
         access_key,
+        iguazio_version,
         password,
         debug,
     )