You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/01/29 15:13:05 UTC
[incubator-datalab] branch DATALAB-2091 updated (5c5770a -> 9dcb48d)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 5c5770a [DATALAB-2091]: added creation of /opt/zeppelin/lib/interpreter/ directory
new 6daa0df [DATALAB-2091]: fixed path to rstudio-server.service
new 51d68fc [DATALAB-2091]: fixed path to python3
new 9dcb48d [DATALAB-2091]: added uninstall of fabric
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/lib/os/debian/notebook_lib.py | 13 +++++++------
.../src/general/lib/os/redhat/notebook_lib.py | 6 +++---
.../gcp/zeppelin_install_dataengine-service_kernels.py | 2 +-
.../templates/aws/jenkins_jobs/gitlab_server/config.xml | 2 +-
.../templates/gcp/jenkins_jobs/gitlab_server/config.xml | 2 +-
5 files changed, 13 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2091]: fixed path to python3
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 51d68fc5cd749705da0d659051875805b6774af6
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Jan 29 17:11:20 2021 +0200
[DATALAB-2091]: fixed path to python3
---
.../general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py | 2 +-
.../src/general/templates/aws/jenkins_jobs/gitlab_server/config.xml | 2 +-
.../src/general/templates/gcp/jenkins_jobs/gitlab_server/config.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
index e25625e..7293330 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
@@ -77,6 +77,6 @@ if __name__ == "__main__":
hadoop_version = datalab.actions_lib.GCPActions().get_cluster_app_version(args.bucket, args.project_name, args.cluster_name, 'hadoop')
sudo('echo "[global]" > /etc/pip.conf; echo "proxy = $(cat /etc/profile | grep proxy | head -n1 | cut -f2 -d=)" >> /etc/pip.conf')
sudo('echo "use_proxy=yes" > ~/.wgetrc; proxy=$(cat /etc/profile | grep proxy | head -n1 | cut -f2 -d=); echo "http_proxy=$proxy" >> ~/.wgetrc; echo "https_proxy=$proxy" >> ~/.wgetrc')
- sudo('unset http_proxy https_proxy; export gcp_project_id="{0}"; export conf_resource="{1}"; /usr/bin/python /usr/local/bin/create_configs.py --bucket {2} --cluster_name {3} --dataproc_version {4} --spark_version {5} --hadoop_version {6} --region {7} --user_name {8} --os_user {9} --pip_mirror {10} --application {11} --livy_version {12} --multiple_clusters {13} --r_enabled {14}'
+ sudo('unset http_proxy https_proxy; export gcp_project_id="{0}"; export conf_resource="{1}"; /usr/bin/python3 /usr/local/bin/create_configs.py --bucket {2} --cluster_name {3} --dataproc_version {4} --spark_version {5} --hadoop_version {6} --region {7} --user_name {8} --os_user {9} --pip_mirror {10} --application {11} --livy_version {12} --multiple_clusters {13} --r_enabled {14}'
.format(os.environ['gcp_project_id'], os.environ['conf_resource'], args.bucket, args.cluster_name, args.dataproc_version, spark_version, hadoop_version,
args.region, args.project_name, args.os_user, args.pip_mirror, args.application, os.environ['notebook_livy_version'], os.environ['notebook_multiple_clusters'], r_enabled))
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/gitlab_server/config.xml b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/gitlab_server/config.xml
index c56318c..ccbbf33 100644
--- a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/gitlab_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/gitlab_server/config.xml
@@ -105,7 +105,7 @@ under the License.
sudo sed -i "s/LDAP_PASS/$ldap_pass/g" $GITLAB_CONFIG_FILE
sudo sed -i "s/GITLAB_ROOT_PASSWORD/$root_password/g" $GITLAB_CONFIG_FILE
- sudo /usr/bin/python $DATALAB_PATH/tmp/gitlab/gitlab_deploy.py --action $Action
+ sudo /usr/bin/python3 $DATALAB_PATH/tmp/gitlab/gitlab_deploy.py --action $Action
</command>
</hudson.tasks.Shell>
</builders>
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/gitlab_server/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/gitlab_server/config.xml
index c56318c..ccbbf33 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/gitlab_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/gitlab_server/config.xml
@@ -105,7 +105,7 @@ under the License.
sudo sed -i "s/LDAP_PASS/$ldap_pass/g" $GITLAB_CONFIG_FILE
sudo sed -i "s/GITLAB_ROOT_PASSWORD/$root_password/g" $GITLAB_CONFIG_FILE
- sudo /usr/bin/python $DATALAB_PATH/tmp/gitlab/gitlab_deploy.py --action $Action
+ sudo /usr/bin/python3 $DATALAB_PATH/tmp/gitlab/gitlab_deploy.py --action $Action
</command>
</hudson.tasks.Shell>
</builders>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: [DATALAB-2091]: added uninstall of fabric
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 9dcb48d14f86ac1e500a6fa6f24b374d7be1a8e6
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Jan 29 17:12:50 2021 +0200
[DATALAB-2091]: added uninstall of fabric
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 1 +
1 file changed, 1 insertion(+)
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 94cbd78..6bfd2e4 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -262,6 +262,7 @@ def ensure_python3_libraries(os_user):
sudo('pip3 install -U pip=={} --no-cache-dir'.format(os.environ['conf_pip_version']))
sudo('pip3 install boto3 --no-cache-dir')
sudo('pip3 install fabvenv fabric-virtualenv future --no-cache-dir')
+ sudo('pip3 unninstall fabric')
sudo('touch /home/' + os_user + '/.ensure_dir/python3_libraries_ensured')
except:
sys.exit(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2091]: fixed path to
rstudio-server.service
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 6daa0df0f9383494c5c4850aeae0dfd66a39e935
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Jan 29 17:08:30 2021 +0200
[DATALAB-2091]: fixed path to rstudio-server.service
---
.../src/general/lib/os/debian/notebook_lib.py | 12 ++++++------
.../src/general/lib/os/redhat/notebook_lib.py | 6 +++---
2 files changed, 9 insertions(+), 9 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 a242a38..94cbd78 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -129,18 +129,18 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version):
sudo('chown {0}:{0} /mnt/var'.format(os_user))
http_proxy = run('echo $http_proxy')
https_proxy = run('echo $https_proxy')
- sudo("sed -i '/Type=forking/a \Environment=USER=datalab-user' /etc/systemd/system/rstudio-server.service")
+ sudo("sed -i '/Type=forking/a \Environment=USER=datalab-user' /lib/systemd/system/rstudio-server.service")
sudo(
- "sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /etc/systemd/system/rstudio-server.service")
- sudo("sed -i '/ExecStart/s|$|\"|g' /etc/systemd/system/rstudio-server.service")
+ "sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /lib/systemd/system/rstudio-server.service")
+ sudo("sed -i '/ExecStart/s|$|\"|g' /lib/systemd/system/rstudio-server.service")
sudo(
- 'sed -i \'/\[Service\]/a Environment=\"HTTP_PROXY={}\"\' /etc/systemd/system/rstudio-server.service'.format(
+ 'sed -i \'/\[Service\]/a Environment=\"HTTP_PROXY={}\"\' /lib/systemd/system/rstudio-server.service'.format(
http_proxy))
sudo(
- 'sed -i \'/\[Service\]/a Environment=\"HTTPS_PROXY={}\"\' /etc/systemd/system/rstudio-server.service'.format(
+ 'sed -i \'/\[Service\]/a Environment=\"HTTPS_PROXY={}\"\' /lib/systemd/system/rstudio-server.service'.format(
https_proxy))
java_home = run("update-alternatives --query java | grep -o \'/.*/java-8.*/jre\'").splitlines()[0]
- sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /etc/systemd/system/rstudio-server.service'.format(
+ sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /lib/systemd/system/rstudio-server.service'.format(
java_home))
sudo("systemctl daemon-reload")
sudo('touch /home/{}/.Renviron'.format(os_user))
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 50e2193..3963ea6 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
@@ -109,10 +109,10 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version):
manage_pkg('-y install --nogpgcheck', 'remote', 'https://download2.rstudio.org/server/centos6/x86_64/rstudio-server-rhel-{}-x86_64.rpm'.format(rstudio_version))
sudo('mkdir -p /mnt/var')
sudo('chown {0}:{0} /mnt/var'.format(os_user))
- sudo("sed -i '/Type=forking/a \Environment=USER=datalab-user' /etc/systemd/system/rstudio-server.service")
+ sudo("sed -i '/Type=forking/a \Environment=USER=datalab-user' /lib/systemd/system/rstudio-server.service")
sudo(
- "sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /etc/systemd/system/rstudio-server.service")
- sudo("sed -i '/ExecStart/s|$|\"|g' /etc/systemd/system/rstudio-server.service")
+ "sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /lib/systemd/system/rstudio-server.service")
+ sudo("sed -i '/ExecStart/s|$|\"|g' /lib/systemd/system/rstudio-server.service")
sudo("systemctl daemon-reload")
sudo('touch /home/{}/.Renviron'.format(os_user))
sudo('chown {0}:{0} /home/{0}/.Renviron'.format(os_user))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org