Merge lp:~psivaa/ubuntu-test-runlists/jenkins-smoketest-setup-1SS-move-update into lp:~canonical-ci-engineering/ubuntu-test-runlists/jenkins-smoketest-setup

[Para Siva]

Converting the IP's into host names and domain names due to the 1SS move. Have changed to hostname to the IP where the images are stored and changed to domain name for jenkins instance, believing that's the most appropriate.

[Andy Doan (doanac)]

untested, but looks fine.

review: Approve

[Paul Larson (pwlars)]

Just out of curiosity, why are you using both of the names tachash and d-jenkins when they are the same system? I've been just using d-jenkins for that one.

[Para Siva (psivaa)]

@Paul: I wanted distinguish the jenkins instance from the host where the images are stored. Here, you could use the same (d-jenkins) for both but the images are stored in the host and that does not strictly need to be in the same jenkins host.

[Para Siva (psivaa)]

Not sure if that was clear.. for e.g. if we migrate jenkins to run somewhere else taking the d-jenkins name and keep the images stored in the same host (tachash) we will end up having issues, because then we will have two different ip's for both.

[Paul Larson (pwlars)]

Sure, I was just thinking it would be more likely that they decide to change the name tachash to something else, or move the entire thing over to a new server, than to change d-jenkins.

=== modified file 'setup-jobs.py'
--- setup-jobs.py	2013-04-30 17:26:12 +0000
+++ setup-jobs.py	2013-11-14 12:33:04 +0000
@@ -43,7 +43,7 @@
         epilog=("For example:\n"
                 "\t%(prog)s /path/to/branch -s " + DEV_SERIES +
                 " -u user -p pass -j http://jenkins:8080"
-                " -i http://10.98.0.1/iso/\n"),
+                " -i http://tachash/iso/\n"),
         formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument("branches", nargs='+',
                         help="Path(s) to branch(es) to process")
@@ -63,12 +63,12 @@
     group.add_argument("-p", "--password",
                        help="Password to use when logging into Jenkins")
 
-    parser.add_argument("-j", "--jenkins", default="http://10.189.74.2:8080/",
+    parser.add_argument("-j", "--jenkins", default="http://d-jenkins.ubuntu-ci:8080/",
                         help="URL of jenkins instance to configure test in")
     parser.add_argument("--node", default="aldebaran",
                         help=("Jenkins node were the job should be executed "
                               "(default=%(default)s)"))
-    parser.add_argument("-i", "--imageurl", default="http://10.98.0.1/iso/",
+    parser.add_argument("-i", "--imageurl", default="http://tachash/iso/",
                         help="URL where images are located")
     parser.add_argument("--prefix",
                         help=("Prefix to be used for job names. "