AMBARI-18872 Zeppelin notebook execution fails due missing spark dependency

ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py

@@ -84,7 +84,7 @@ class Master(Script):
                         recursive_chmod=True
                         )
 
-    spark_deps_full_path = glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar')[0]
+    spark_deps_full_path = self.get_zeppelin_spark_dependencies()[0]
     spark_dep_file_name = os.path.basename(spark_deps_full_path);
 
     params.HdfsResource(params.spark_jar_dir + "/" + spark_dep_file_name,
@@ -168,9 +168,8 @@ class Master(Script):
         zeppelin_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ")
         Execute(zeppelin_kinit_cmd, user=params.zeppelin_user)
 
-    if glob.glob(
-            params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar') and os.path.exists(
-      glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar')[0]):
+    zeppelin_spark_dependencies = self.get_zeppelin_spark_dependencies()
+    if zeppelin_spark_dependencies and os.path.exists(zeppelin_spark_dependencies[0]):
       self.create_zeppelin_dir(params)
 
     # if first_setup:
@@ -326,5 +325,9 @@ class Master(Script):
         return False
     return False
 
+  def get_zeppelin_spark_dependencies(self):
+    import params
+    return glob.glob(params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies*.jar')
+
 if __name__ == "__main__":
   Master().execute()

ambari-server/src/main/resources/scripts/Ambaripreupload.py

@@ -415,7 +415,7 @@ with Environment() as env:
   copy_tarballs_to_hdfs(format("/usr/hdp/{stack_version}/sqoop/sqoop.tar.gz"), hdfs_path_prefix+"/hdp/apps/{{ stack_version_formatted }}/sqoop/", 'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user, params.user_group)
   
   createHdfsResources()
-  copy_zeppelin_dependencies_to_hdfs(format("/usr/hdp/{stack_version}/zeppelin/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar"))
+  copy_zeppelin_dependencies_to_hdfs(format("/usr/hdp/{stack_version}/zeppelin/interpreter/spark/dep/zeppelin-spark-dependencies*.jar"))
   putSQLDriverToOozieShared()
   putCreatedHdfsResourcesToIgnore(env)
 

ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml

@@ -21,7 +21,7 @@
   <services>
     <service>
       <name>ZEPPELIN</name>
-      <version>0.6.0.2.5</version>
+      <version>0.7.0.2.6</version>
     </service>
   </services>
 </metainfo>