This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1974 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f64f6c3ec3bc8bdc03ae913f8e10a3247ab9c0ca Author: leonidfrolov <[email protected]> AuthorDate: Tue Aug 4 10:33:56 2020 +0300 [DLAB-1974]: changed how temp log files name is formatted --- .../src/general/lib/os/debian/notebook_lib.py | 19 ++++++++++--------- infrastructure-provisioning/src/general/lib/os/fab.py | 18 ++++++++++-------- .../src/general/lib/os/redhat/notebook_lib.py | 9 +++++---- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py index bfd4314..b5946f7 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py @@ -371,6 +371,7 @@ def install_os_pkg(requisites): print("Updating repositories and installing requested tools: {}".format(requisites)) manage_pkg('update', 'remote', '') for os_pkg in requisites: + name, vers = os_pkg if os_pkg[1] != '' and os_pkg[1] !='N/A': version = os_pkg[1] os_pkg = "{}={}".format(os_pkg[0], os_pkg[1]) @@ -378,18 +379,18 @@ def install_os_pkg(requisites): version = 'N/A' os_pkg = os_pkg[0] sudo('DEBIAN_FRONTEND=noninteractive apt-get -y install --allow-downgrades {0} 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E "({1})" /tmp/tee.tmp > ' - '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(os_pkg, error_parser)) - err = sudo('cat /tmp/os_install_{}.log'.format(os_pkg)).replace('"', "'") + '/tmp/os_install_{2}.log; then echo "" > /tmp/os_install_{2}.log;fi'.format(os_pkg.split("=")[0], error_parser, name)) + err = sudo('cat /tmp/os_install_{}.log'.format(name)).replace('"', "'") sudo('cat /tmp/tee.tmp | if ! grep -w -E -A 30 "({1})" /tmp/tee.tmp > ' - '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(os_pkg, new_pkgs_parser)) - dep = sudo('cat /tmp/os_install_{}.log'.format(os_pkg)) + '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(name, new_pkgs_parser)) + dep = sudo('cat /tmp/os_install_{}.log'.format(name)) if dep == '': dep = [] else: dep = dep[len(new_pkgs_parser): dep.find(" upgraded, ") - 1].replace('\r', '') \ .replace('\n', '').replace(' ', ' ').strip().split(' ') for n, i in enumerate(dep): - if i == os_pkg.split("=")[0]: + if i == name: dep[n] = '' else: sudo('apt show {0} 2>&1 | if ! grep Version: > ' @@ -397,8 +398,8 @@ def install_os_pkg(requisites): dep[n] =sudo('cat /tmp/os_install_{}.log'.format(i)).replace('Version: ', '{} v.'.format(i)) dep = [i for i in dep if i] versions = [] - sudo('apt list --installed | if ! grep {0}/ > /tmp/os_install_{1}.list; then echo "" > /tmp/os_install_{1}.list;fi'.format(os_pkg.split("=")[0], os_pkg)) - res = sudo('cat /tmp/os_install_{}.list'.format(os_pkg)) + sudo('apt list --installed | if ! grep {0}/ > /tmp/os_install_{0}.list; then echo "" > /tmp/os_install_{0}.list;fi'.format(name)) + res = sudo('cat /tmp/os_install_{}.list'.format(name)) if err: status_msg = 'installation_error' elif res: @@ -407,11 +408,11 @@ def install_os_pkg(requisites): version = [i for i in ver if os_pkg.split("=")[0] in i][0].split(' ')[1] status_msg = "installed" if 'E: Version' in err and 'was not found' in err: - versions = sudo ('apt-cache policy {} | grep 500 | grep -v Packages'.format(os_pkg.split("=")[0]))\ + versions = sudo ('apt-cache policy {} | grep 500 | grep -v Packages'.format(name))\ .replace('\r\n', '').replace(' 500', '').replace(' ', ' ').replace('***', '').strip().split(' ') if versions != '': status_msg = 'invalid_version' - status.append({"group": "os_pkg", "name": os_pkg.split("=")[0], "version": version, "status": status_msg, + status.append({"group": "os_pkg", "name": name, "version": version, "status": status_msg, "error_message": err, "add_pkgs": dep, "available_versions": versions}) sudo('unattended-upgrades -v') sudo('export LC_ALL=C') diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py index 45cd5c7..8fe8ace 100644 --- a/infrastructure-provisioning/src/general/lib/os/fab.py +++ b/infrastructure-provisioning/src/general/lib/os/fab.py @@ -62,16 +62,18 @@ def install_pip_pkg(requisites, pip_version, lib_group): sudo('{} install -U pip=={} --no-cache-dir'.format(pip_version, os.environ['conf_pip_version'])) sudo('{} install --upgrade pip=={}'.format(pip_version, os.environ['conf_pip_version'])) for pip_pkg in requisites: + name, vers = pip_pkg if pip_pkg[1] == '' or pip_pkg[1] == 'N/A': pip_pkg = pip_pkg[0] version = 'N/A' else: version = pip_pkg[1] pip_pkg = "{}=={}".format(pip_pkg[0], pip_pkg[1]) - sudo('{0} install -U {1} --no-cache-dir 2>&1 | tee /tmp/tee.tmp; if ! grep -w -i -E "({2})" /tmp/tee.tmp > /tmp/{0}install_{1}.log; then echo "" > /tmp/{0}install_{1}.log;fi'.format(pip_version, pip_pkg, error_parser)) - err = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg)).replace('"', "'") - sudo('{0} freeze | if ! grep -w -i {1} > /tmp/{0}install_{1}.list; then echo "" > /tmp/{0}install_{1}.list;fi'.format(pip_version, pip_pkg)) - res = sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, pip_pkg)) + sudo('{0} install -U {1} --no-cache-dir 2>&1 | tee /tmp/tee.tmp; if ! grep -w -i -E "({2})" /tmp/tee.tmp > ' + ' /tmp/{0}install_{2}.log; then echo "" > /tmp/{0}install_{2}.log;fi'.format(pip_version, pip_pkg, error_parser, name)) + err = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg.split("==")[0])).replace('"', "'") + sudo('{0} freeze | if ! grep -w -i {1} > /tmp/{0}install_{1}.list; then echo "" > /tmp/{0}install_{1}.list;fi'.format(pip_version, name)) + res = sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, name)) changed_pip_pkg = False if res == '': changed_pip_pkg = pip_pkg.split("==")[0].replace("_", "-").split('-') @@ -101,21 +103,21 @@ def install_pip_pkg(requisites, pip_version, lib_group): versions = [] sudo('if ! grep -w -i -E "Installing collected packages:" /tmp/tee.tmp > /tmp/{0}install_{1}.log; ' - 'then echo "" > /tmp/{0}install_{1}.log;fi'.format(pip_version, pip_pkg)) - dep = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg)).replace('\r\n', '').strip()[31:] + 'then echo "" > /tmp/{0}install_{1}.log;fi'.format(pip_version, name)) + dep = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, name)).replace('\r\n', '').strip()[31:] if dep == '': dep = [] else: dep = dep.split(', ') for n, i in enumerate(dep): - if i == pip_pkg.split("==")[0]: + if i == name: dep[n] = '' else: sudo('{0} show {1} 2>&1 | if ! grep Version: /tmp/tee.tmp > ' '/tmp/{0}_install_{1}.log; then echo "" > /tmp/{0}_install_{1}.log;fi'.format(pip_version, i)) dep[n] = sudo('cat /tmp/{0}_install_{1}.log'.format(pip_version, i)).replace('Version: ', '{} v.'.format(i)) dep = [i for i in dep if i] - status.append({"group": lib_group, "name": pip_pkg.split("==")[0], "version": version, "status": status_msg, + status.append({"group": lib_group, "name": name, "version": version, "status": status_msg, "error_message": err, "available_versions": versions, "add_pkgs": dep}) return status except Exception as err: diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py index cf7d8d1..e2b2b0d 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py @@ -359,12 +359,13 @@ def install_os_pkg(requisites): else: version = 'N/A' os_pkg = name - manage_pkg('-y install', 'remote', '{0} --nogpgcheck 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E "({1})" /tmp/tee.tmp > /tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(os_pkg, error_parser)) + manage_pkg('-y install', 'remote', '{0} --nogpgcheck 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E "({1})" ' + '/tmp/tee.tmp > /tmp/os_install_{2}.log; then echo "" > /tmp/os_install_{2}.log;fi'.format(os_pkg, error_parser, name)) install_output = sudo('cat /tmp/tee.tmp') - err = sudo('cat /tmp/os_install_{}.log'.format(os_pkg)).replace('"', "'") + err = sudo('cat /tmp/os_install_{}.log'.format(name)).replace('"', "'") sudo('cat /tmp/tee.tmp | if ! grep -w -E -A 30 "({1})" /tmp/tee.tmp > ' - '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(os_pkg, new_pkgs_parser)) - dep = sudo('cat /tmp/os_install_{}.log'.format(os_pkg)) + '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(name, new_pkgs_parser)) + dep = sudo('cat /tmp/os_install_{}.log'.format(name)) if dep == '': dep = [] else: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
