You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/02/28 14:36:04 UTC
[incubator-dlab] branch EPMCDLAB-1186 updated: fixed issue with
maven
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new eb6150c fixed issue with maven
eb6150c is described below
commit eb6150c80b4befb998be4dfaa08b0b8d8d319704
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Feb 28 16:35:48 2019 +0200
fixed issue with maven
---
.../src/general/lib/os/debian/ssn_lib.py | 13 +++++++++++++
.../src/general/scripts/aws/ssn_configure.py | 2 +-
infrastructure-provisioning/src/ssn/templates/settings.xml | 2 --
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 246a7d8..c1ee5d5 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -343,6 +343,19 @@ def install_build_dep():
put('templates/settings.xml', '/tmp/settings.xml')
sudo('sed -i "s|REPOSITORY_MAVEN_REPO|{}|g" /tmp/settings.xml'.format(
os.environ['local_repository_maven_central_repo']))
+ if 'local_repository_user_name' in os.environ and 'local_repository_user_password' in os.environ:
+ sudo('sed -i "$ d" /tmp/settings.xml')
+ sudo('echo "<servers>" >> /tmp/settings.xml')
+ sudo('echo "<server>" >> /tmp/settings.xml')
+ sudo('echo "<id>dlab-repo</id>" >> /tmp/settings.xml')
+ sudo('echo "<username>{}</username>" >> /tmp/settings.xml'.format(
+ os.environ['local_repository_user_name']))
+ sudo('echo "<password>{}</password>" >> /tmp/settings.xml'.format(
+ os.environ['local_repository_user_password']
+ ))
+ sudo('echo "</server>" >> /tmp/settings.xml')
+ sudo('echo "</servers>" >> /tmp/settings.xml')
+ sudo('echo "</settings>" >> /tmp/settings.xml')
sudo('cp -f /tmp/settings.xml apache-maven-{}/conf/'.format(maven_version))
else:
sudo(
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index d55236c..8b5eee5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -61,7 +61,7 @@ if __name__ == "__main__":
if os.environ['local_repository_enabled'] == 'True' and 'local_repository_user_name' \
in os.environ and 'local_repository_user_password' in os.environ:
basic_auth_repos = ('apt_bintray_repo', 'apt_ubuntu_security_repo', 'apt_ubuntu_repo', 'docker_repo',
- 'jenkins_repo', 'maven_bintray_repo', 'maven_central_repo', 'mongo_repo', 'pypi_repo',
+ 'jenkins_repo', 'maven_bintray_repo', 'mongo_repo', 'pypi_repo',
'packages_repo', 'r_repo', 'rrutter_repo')
for repo in basic_auth_repos:
os.environ['local_repository_{}'.format(repo)] = os.environ['local_repository_{}'.format(
diff --git a/infrastructure-provisioning/src/ssn/templates/settings.xml b/infrastructure-provisioning/src/ssn/templates/settings.xml
index 0fc3366..8c31ab3 100644
--- a/infrastructure-provisioning/src/ssn/templates/settings.xml
+++ b/infrastructure-provisioning/src/ssn/templates/settings.xml
@@ -8,8 +8,6 @@
</pluginGroups>
<proxies>
</proxies>
- <servers>
- </servers>
<mirrors>
<mirror>
<id>dlab-repo</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org