Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2020-10-12 13:59:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Mon Oct 12 13:59:28 2020 rev:22 rq:841087 version:0.6.1+git.1602450838.fd96493
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2020-10-10 00:29:39.633162210 +0200
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.3486/saphanabootstrap-formula.changes
2020-10-12 14:00:10.266237521 +0200
@@ -1,0 +2,5 @@
+Sun Oct 11 04:21:32 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
+
+- Fix the hana media extraction and installation logics when using exe
archives
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7.tar.gz
New:
----
saphanabootstrap-formula-0.6.1+git.1602450838.fd96493.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.WlLy23/_old 2020-10-12 14:00:11.078237860 +0200
+++ /var/tmp/diff_new_pack.WlLy23/_new 2020-10-12 14:00:11.082237862 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.6.1+git.1602220404.4a60aa7
+Version: 0.6.1+git.1602450838.fd96493
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.WlLy23/_old 2020-10-12 14:00:11.126237880 +0200
+++ /var/tmp/diff_new_pack.WlLy23/_new 2020-10-12 14:00:11.126237880 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">saphanabootstrap-formula</param>
<param name="versionformat">0.6.1+git.%ct.%h</param>
- <param name="revision">4a60aa7acce3fd2673624eea0f498730a62cabbc</param>
+ <param name="revision">fd9649323153de0a55c7ed2158c07a314d7f1096</param>
</service>
<service name="recompress" mode="disabled">
++++++ saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7.tar.gz ->
saphanabootstrap-formula-0.6.1+git.1602450838.fd96493.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/enable_cost_optimized.sls
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/enable_cost_optimized.sls
---
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/enable_cost_optimized.sls
2020-10-09 07:13:24.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/enable_cost_optimized.sls
2020-10-11 23:13:58.000000000 +0200
@@ -1,5 +1,6 @@
{%- from "hana/map.jinja" import hana with context -%}
-{%- from "hana/extract_hana_package.sls" import hana_extract_dir with context
-%}
+{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
+{% set hana_extract_dir = get_hana_exe_extract_dir(hana) %}
{% set host = grains['host'] %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/extract_hana_package.sls
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/extract_hana_package.sls
---
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/extract_hana_package.sls
2020-10-09 07:13:24.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/extract_hana_package.sls
2020-10-11 23:13:58.000000000 +0200
@@ -25,6 +25,7 @@
pkg.installed:
- name: {{ unrar_package }}
+# unrar tool does not have the option to skip extracting top-level directory
when using multipart exe archives#
extract_hana_multipart_archive:
cmd.run:
- name: unrar x {{ hana_package }}
@@ -32,12 +33,6 @@
- require:
- install_unrar_package
-{# Below is temporary workaround to update the extraction path when using
unrar for multipart rar archive#}
-{# TODO: Find better solution to set or detect the correct extraction path
when extracting multipart rar archive#}
-{% set archive_base_name = salt['file.basename'](hana_package.split('.')[0]) %}
-{% set archive_name = archive_base_name.split('_')[0] %}
-{% set hana_extract_dir = hana_extract_dir| path_join(archive_name) %}
-
{%- elif hana_package.endswith((".sar", ".SAR")) and hana.sapcar_exe_file is
defined %}
extract_hdbserver_sar_archive:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/install.sls
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/install.sls
--- old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/install.sls
2020-10-09 07:13:24.000000000 +0200
+++ new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/install.sls
2020-10-11 23:13:58.000000000 +0200
@@ -1,6 +1,7 @@
{%- from "hana/map.jinja" import hana with context -%}
+{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
{% set host = grains['host'] %}
-{% set hana_extract_dir = hana.hana_extract_dir %}
+{% set hana_extract_dir = get_hana_exe_extract_dir(hana) %}
include:
- .enable_cost_optimized
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/macros/get_hana_exe_extract_dir.sls
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/macros/get_hana_exe_extract_dir.sls
---
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/macros/get_hana_exe_extract_dir.sls
1970-01-01 01:00:00.000000000 +0100
+++
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/macros/get_hana_exe_extract_dir.sls
2020-10-11 23:13:58.000000000 +0200
@@ -0,0 +1,12 @@
+{% macro get_hana_exe_extract_dir(hana) -%}
+{%- set hana_extract_dir = hana.hana_extract_dir %}
+ {#- Below is temporary workaround to update the software installation path
when using unrar for HANA multipart rar archive#}
+ {#- TODO: Find better solution to set or detect the correct extraction
path when extracting multipart rar archive#}
+ {#- Below logic finds the extraction location based on name of multipart
exe archive filename#}
+ {%- if hana.hana_archive_file is defined and
hana.hana_archive_file.endswith((".exe", ".EXE")) %}
+ {%- set archive_base_name = salt['file.basename'](
hana.hana_archive_file.split('.')[0]) %}
+ {%- set archive_name = archive_base_name.split('_')[0] %}
+ {%- set hana_extract_dir = hana_extract_dir| path_join(archive_name) %}
+ {%- endif %}
+{{- hana_extract_dir }}
+{%- endmacro %}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/monitoring.sls
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/monitoring.sls
---
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/hana/monitoring.sls
2020-10-09 07:13:24.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/hana/monitoring.sls
2020-10-11 23:13:58.000000000 +0200
@@ -1,5 +1,6 @@
{%- from "hana/map.jinja" import hana with context -%}
-{%- from "hana/extract_hana_package.sls" import hana_extract_dir with context
-%}
+{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
+{% set hana_extract_dir = get_hana_exe_extract_dir(hana) %}
{% set pydbapi_output_dir = '/tmp/pydbapi' %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/saphanabootstrap-formula.changes
---
old/saphanabootstrap-formula-0.6.1+git.1602220404.4a60aa7/saphanabootstrap-formula.changes
2020-10-09 07:13:24.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.1+git.1602450838.fd96493/saphanabootstrap-formula.changes
2020-10-11 23:13:58.000000000 +0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sun Oct 11 04:21:32 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
+
+- Fix the hana media extraction and installation logics when using exe
archives
+
+-------------------------------------------------------------------
Thu Oct 8 02:34:37 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
- Update the SUMA hana form metadata, to show hana form under SAP deployment
group
