This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch epm-v2.2-rc1-versions
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/epm-v2.2-rc1-versions by this
push:
new 609e1ee [DLAB-1349] - Dataproc version updated
609e1ee is described below
commit 609e1eec4dce50684411afd53f816033e0bdfd24
Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com>
AuthorDate: Wed Dec 18 15:59:37 2019 +0200
[DLAB-1349] - Dataproc version updated
---
.../general/files/gcp/dataengine-service_description.json | 4 ++--
.../general/scripts/gcp/dataengine-service_jars_parser.py | 14 ++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
index b5f337a..1bf4fb6 100644
---
a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
+++
b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
@@ -25,7 +25,7 @@
},
"templates":
[
- {"version":"1.2", "applications": [{"Name":"Hadoop", "Version": "2.8.2"},
{"Name":"Spark", "Version": "2.2.0"}, {"Name":"Hive", "Version": "2.1.1"}]},
- {"version":"1.3", "applications": [{"Name":"Hadoop", "Version": "2.9.2"},
{"Name":"Spark", "Version": "2.3.2"}, {"Name":"Hive", "Version": "2.3.4"}]}
+ {"version":"1.3", "applications": [{"Name":"Hadoop", "Version": "2.9.2"},
{"Name":"Spark", "Version": "2.3.2"}, {"Name":"Hive", "Version": "2.3.4"}]},
+ {"version":"1.4", "applications": [{"Name":"Hadoop", "Version": "2.9.2"},
{"Name":"Spark", "Version": "2.4.4"}, {"Name":"Hive", "Version": "2.3.6"}]}
]
}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_jars_parser.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_jars_parser.py
index 4fd5a4a..9a52bd1 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_jars_parser.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_jars_parser.py
@@ -44,14 +44,12 @@ if __name__ == "__main__":
outfile.write(r_ver)
os.system('touch /tmp/python_version')
- python_ver = subprocess.check_output("python3.5 -V 2>/dev/null | awk
'{print $2}'", shell=True).decode('UTF-8')
- if python_ver != '':
- with open('/tmp/python_version', 'w') as outfile:
- outfile.write(python_ver)
- else:
- python_ver = subprocess.check_output("python3.4 -V 2>/dev/null | awk
'{print $2}'", shell=True).decode('UTF-8')
- with open('/tmp/python_version', 'w') as outfile:
- outfile.write(python_ver)
+ for v in range(4, 7):
+ python_ver_checker = "python3.{} -V 2>/dev/null".format(v) + " | awk
'{print $2}'"
+ python_ver = subprocess.check_output(python_ver_checker,
shell=True).decode('UTF-8')
+ if python_ver != '':
+ with open('/tmp/python_version', 'w') as outfile:
+ outfile.write(python_ver)
os.system('touch /tmp/spark_version')
spark_ver = subprocess.check_output("dpkg -l | grep spark-core | tr -s ' '
'-' | cut -f 4 -d '-'", shell=True).decode('UTF-8')
with open('/tmp/spark_version', 'w') as outfile:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
