Merge pull request #217 from tmobile/v1.5.1

Release v1.6 Former-commit-id: b60736e
tmobile · May 31, 2018 · 40f74d6 · 40f74d6
2 parents b010f20 + af97e34
commit 40f74d6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/installscripts/cookbooks/jenkins/files/node/jazz-installer-vars.json b/installscripts/cookbooks/jenkins/files/node/jazz-installer-vars.json
@@ -74,8 +74,24 @@
     	"PASSWORD": ""
    },
    "UI_CONFIG": { 
-      	"feature": {
-        	"multi_env": true
-      	}
-    }
+		 "feature": {
+			 "multi_env": true
+		 },
+		 "service_tabs":
+		 {
+			 "overview": true,
+			 "access_control": false,
+			 "metrics": false,
+			 "logs": true,
+			 "cost": false
+		 },
+		 "environment_tabs":
+		 {
+			 "overview": true,
+			 "deployments": true,
+			 "code_quality": false,
+			 "logs": false,
+			 "assets": false
+		 }
+   }
 }
diff --git a/installscripts/dockerfiles/gitlab/gitlab.sh b/installscripts/dockerfiles/gitlab/gitlab.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 passwd=$1
+rootemail=$2
 chmod -R 777 /var/opt/gitlab
-yes yes| /opt/gitlab/bin/gitlab-rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=$passwd > ~/out.txt 2>&1
+yes yes| /opt/gitlab/bin/gitlab-rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_EMAIL=$rootemail GITLAB_ROOT_PASSWORD=$passwd > ~/out.txt 2>&1
 grep -A4 Administrator ~/out.txt | tee -a ~/gitlab-creds.txt
diff --git a/installscripts/dockerfiles/gitlab/launch_gitlab_docker.sh b/installscripts/dockerfiles/gitlab/launch_gitlab_docker.sh
@@ -67,9 +67,10 @@ sleep 180 &
 spin_wheel $! "Launching the Gitlab Docker"
 
 # Setting up admin credentials
-passwd=`date | md5sum | cut -d ' ' -f1`
+passwd=$1
+rootemail=$2
 docker cp gitlab.sh gitlab:/root/gitlab.sh
-docker exec gitlab /bin/bash /root/gitlab.sh $passwd > credentials.txt 2>&1&
+docker exec gitlab /bin/bash /root/gitlab.sh $passwd $rootemail > credentials.txt 2>&1&
 spin_wheel $! "Setting up admin credentials"
 
 # Installing epel

diff --git a/installscripts/jazz-terraform-unix-noinstances/scmProvisioner.tf b/installscripts/jazz-terraform-unix-noinstances/scmProvisioner.tf
@@ -32,7 +32,7 @@ resource "null_resource" "configureJazzBuildModule" {
 
   provisioner "remote-exec"{
     inline = [
-      "git clone http://${lookup(var.scmmap, "scm_username")}:${lookup(var.scmmap, "scm_passwd")}@${lookup(var.scmmap, "scm_elb")}${lookup(var.scmmap, "scm_pathext")}/slf/jazz-build-module.git",
+      "git clone http://${lookup(var.scmmap, "scm_username")}:${urlencode(lookup(var.scmmap, "scm_passwd"))}@${lookup(var.scmmap, "scm_elb")}${lookup(var.scmmap, "scm_pathext")}/slf/jazz-build-module.git",
       "cd jazz-build-module",
       "cp ~/cookbooks/jenkins/files/node/jazz-installer-vars.json .",
       "git add jazz-installer-vars.json",

diff --git a/installscripts/wizard/scenarios/stack_with_dockerized_gitlab_jenkins.py b/installscripts/wizard/scenarios/stack_with_dockerized_gitlab_jenkins.py
@@ -36,7 +36,7 @@ def start(parameter_list):
 
     # Deploy Gitlab docker and get configuration details
     print("Deploying Dockerized Gitlab server==============>")
-    get_and_add_docker_gitlab_config(get_docker_path() + "/gitlab/")
+    get_and_add_docker_gitlab_config(get_docker_path() + "/gitlab/", parameter_list[1])
 
     # All variables are set and ready to call terraform
     os.chdir(get_terraform_folder())

diff --git a/installscripts/wizard/scenarios/support/jazz_gitlab.py b/installscripts/wizard/scenarios/support/jazz_gitlab.py
@@ -21,15 +21,15 @@ def add_gitlab_config_to_files(parameter_list):
     replace_tfvars('scm_pathext', '/', get_tfvars_file())
 
 
-def get_and_add_docker_gitlab_config(gitlab_docker_path):
+def get_and_add_docker_gitlab_config(gitlab_docker_path, parameter_cred_list=[]):
     """
         Launch a Dockerized Gitlab server.
     """
     os.chdir(gitlab_docker_path)
     print("Running docker launch script  for gitlab")
 
     subprocess.call([
-        'sg', 'docker', './launch_gitlab_docker.sh', '|', 'tee', '-a',
+        'sg', 'docker',  './launch_gitlab_docker.sh %s %s' %( str(parameter_cred_list[1]) , str(parameter_cred_list[0])), '|', 'tee', '-a',
         '../../gitlab_creation.out'
     ])