[Jenkins] Fixes

Fix url resolution (use moscow dns)
Fix error in config
Fix error in add_repo procedure

Change-Id: I7512bdc24ddd435078dc24619a37ef4ad1c56770

diff --git a/jenkins/build_cluster/build_cluster.py b/jenkins/build_cluster/build_cluster.py
index 54820cc4160bde6551314e16707ffd5ac1e45f82..283a96be45b3547f3ff46ea6a8aa3650610feb3f 100755 (executable)
--- a/jenkins/build_cluster/build_cluster.py
+++ b/jenkins/build_cluster/build_cluster.py
@@ -394,13 +394,14 @@ def send_keys(instance):
         " ip={ip}\n"
         " netmask={netmask}\n"
         " gw={gw}\n"
-        " dns1={gw}\n"
+        " dns1={dns}\n"
         " showmenu=no\n"
         " <Enter>\n"
     ).format(
         ip=str(cfg["ADMIN_SUBNET"].ip + 2),
         netmask=str(cfg["ADMIN_SUBNET"].netmask),
-        gw=str(cfg["ADMIN_SUBNET"].ip + 1)
+        gw=str(cfg["ADMIN_SUBNET"].ip + 1),
+        dns="172.18.16.10", #Moscow DNS
     )
     print (keys)
     key_codes = scancodes.from_string(str(keys))
@@ -736,7 +737,7 @@ def main():
         pswd = cfg["FUEL_SSH_PASSWORD"],)
 
     if cfg["ADD_CENT_REPO"]!="":
-        add_cent_repo(cfg["ADD_CENT_REPO"])
+        add_cent_repo(admin_node,cfg["ADD_CENT_REPO"])
 
     if cfg["UPDATE_FUEL"]=="true":
         if do_update(admin_node):

diff --git a/jenkins/build_cluster/config.xml b/jenkins/build_cluster/config.xml
index 8262105dce996f15b33186b57d5594b4640454e3..1349499cf8117403c277aa9514c2052d9e758f04 100644 (file)
--- a/jenkins/build_cluster/config.xml
+++ b/jenkins/build_cluster/config.xml
@@ -145,7 +145,7 @@ export PYTHONUNBUFFERED=1
 curl -o ./build_cluster.py "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/build_cluster.py"
 curl -o ./scancodes.py "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/scancodes.py"
 curl -o ./update_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/update_helper.sh"
-curl -o ./update_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/repo_helper.sh"
+curl -o ./repo_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/repo_helper.sh"
 
 chmod +x update_helper.sh
 chmod +x repo_helper.sh