ue-qa-kernel-tests-infrastructure

Merge lp:~pwlars/ue-qa-kernel-tests-infrastructure/fix-10.97-ip-addresses into lp:ue-qa-kernel-tests-infrastructure

  1. fix-10.97-ip-addresses
  2. Merge into trunk
Proposed by Paul Larson
Status: Merged
Merged at revision: 346
Proposed branch: lp:~pwlars/ue-qa-kernel-tests-infrastructure/fix-10.97-ip-addresses
Merge into: lp:ue-qa-kernel-tests-infrastructure
Diff against target: 126 lines (+14/-14)
5 files modified
kernel-sru-check (+1/-1)
kernel-sru/arm-sru-utils.sh (+6/-6)
kernel-sru/check-devel-kernel.sh (+2/-2)
kernel-sru/expect-armada.sh (+1/-1)
kernel-sru/rsync-mini-iso.sh (+4/-4)
To merge this branch: bzr merge lp:~pwlars/ue-qa-kernel-tests-infrastructure/fix-10.97-ip-addresses
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
Paul Larson Needs Resubmitting
Review via email: mp+194561@code.launchpad.net

Description of the change

This just fixes the ones that we know are changing right now

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) wrote :

I have not cross checked the names against the ips. Assuming they are correct.

review: Approve
lp:~pwlars/ue-qa-kernel-tests-infrastructure/fix-10.97-ip-addresses updated
347. By Paul Larson

replace some of the 10.98 addresses

Revision history for this message
Paul Larson (pwlars) wrote :

Added a few more, there are some more things to update (perhaps) in the 1ss side still, but some of them don't have hostnames afaics, but should be safe for now I hope.

review: Needs Resubmitting
Revision history for this message
Para Siva (psivaa) wrote :

Thanks again for this change, Paul. The name changes appear to be consistent with the available information. We probably need to see if all the jobs run fine with all the other changes happening with the data centre move. We could do that one by one. But as of now this is fine.
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kernel-sru-check'
2--- kernel-sru-check 2012-09-05 20:13:06 +0000
3+++ kernel-sru-check 2013-11-08 20:32:10 +0000
4@@ -47,7 +47,7 @@
5
6 VERSIONS = "hardy lucid natty oneiric precise"
7 ARMS = "armel" # tag for Dove/Omapx
8-JENKINS_URL = "http://10.189.74.2:8080"
9+JENKINS_URL = "http://d-jenkins.ubuntu-ci:8080"
10 JENKINS_TOKEN = "Kernel-SRU"
11 JENKINS_JOB = "job/sru-kernel"
12 JOB_TYPE = [ 'vm', 'bare-metal' ]
13
14=== modified file 'kernel-sru/arm-sru-utils.sh'
15--- kernel-sru/arm-sru-utils.sh 2013-11-05 18:58:37 +0000
16+++ kernel-sru/arm-sru-utils.sh 2013-11-08 20:32:10 +0000
17@@ -68,15 +68,15 @@
18 case $TESTHOST in
19 qa-panda-1)
20 CDU_NAME=qa_panda_1
21- CDU_HOST=10.97.0.30
22+ CDU_HOST=cdu-chimay-1.ubuntu-ci
23 ;;
24 qa-panda-2)
25 CDU_NAME=qa_panda_2
26- CDU_HOST=10.97.0.30
27+ CDU_HOST=cdu-chimay-1.ubuntu-ci
28 ;;
29 qa-panda-3)
30 CDU_NAME=qa_panda_3
31- CDU_HOST=10.97.0.30
32+ CDU_HOST=cdu-chimay-1.ubuntu-ci
33 ;;
34 Onibi|Onza|Zmeu|Zuijin)
35 CDU_NAME=$TESTHOST
36@@ -88,7 +88,7 @@
37 ;;
38 Armada1)
39 CDU_NAME="Armada1"
40- CDU_HOST="10.97.0.14"
41+ CDU_HOST="cdu-rack-4.ubuntu-ci"
42 ;;
43 *) sys_exit_KO "unknown test host $TESTHOST, croaking";;
44 esac
45@@ -541,11 +541,11 @@
46 IMAGE="ISOs/quantal/ubuntu-12.10-server-armhf+omap4.img"
47 ;;
48 esac
49- appendCmd="append console=ttyO2,115200n8 imageurl=http://10.97.0.1/${IMAGE} bootcfg=http://10.97.0.1/bamboo-preseeds/preEnv.${PXE_TABLE[$TESTHOST]}"
50+ appendCmd="append console=ttyO2,115200n8 imageurl=http://jatayu.ubuntu-ci/${IMAGE} bootcfg=http://jatayu.ubuntu-ci/bamboo-preseeds/preEnv.${PXE_TABLE[$TESTHOST]}"
51 ;;
52 armadaxp)
53 netBootDir="armadaxp/$RELEASE"
54- appendCmd="append console=ttyS0,115200 earlyprintk=ttyS0 pm_disable ro text country=US locale=en_US language=en cdrom-detect/try-usb=true netcfg/choose_interface=auto auto url=http://10.97.0.1/bamboo-preseeds/preseed-server-arm.cfg hostname=armada1 priority=critical DEBCONF_DEBUG=developer"
55+ appendCmd="append console=ttyS0,115200 earlyprintk=ttyS0 pm_disable ro text country=US locale=en_US language=en cdrom-detect/try-usb=true netcfg/choose_interface=auto auto url=http://jatayu.ubuntu-ci/bamboo-preseeds/preseed-server-arm.cfg hostname=armada1 priority=critical DEBCONF_DEBUG=developer"
56 ;;
57 *)
58 sys_exit_KO "unkown system type, should be 'armadaxp' or 'panda': $TYPE"
59
60=== modified file 'kernel-sru/check-devel-kernel.sh'
61--- kernel-sru/check-devel-kernel.sh 2013-04-05 15:41:56 +0000
62+++ kernel-sru/check-devel-kernel.sh 2013-11-08 20:32:10 +0000
63@@ -89,8 +89,8 @@
64
65 for thisRelease in $URLRELEASE; do
66 RELEASE=$(echo $thisRelease | tr "[:upper:]" "[:lower:]")
67- BASEURLCOMMON=$(printf "http://10.98.0.1:8080/view/Kernel/view/%s-kernelSRU/job" $thisRelease)
68- BASEURLLTS=$(printf "http://10.98.0.1:8080/view/Kernel/view/%s-lts-hwe-kernelSRU/job" $thisRelease)
69+ BASEURLCOMMON=$(printf "http://d-jenkins.ubuntu-ci:8080/view/Kernel/view/%s-kernelSRU/job" $thisRelease)
70+ BASEURLLTS=$(printf "http://d-jenkins.ubuntu-ci:8080/view/Kernel/view/%s-lts-hwe-kernelSRU/job" $thisRelease)
71 BASEFILE="$currDir/kernel-devel-${RELEASE}-current.txt"
72 BASEFILE_LTS="$currDir/kernel-devel-${RELEASE}-current-lts.txt"
73 base=$(cat $BASEFILE)
74
75=== modified file 'kernel-sru/expect-armada.sh'
76--- kernel-sru/expect-armada.sh 2013-08-07 21:20:52 +0000
77+++ kernel-sru/expect-armada.sh 2013-11-08 20:32:10 +0000
78@@ -2,7 +2,7 @@
79
80 set hostname [lindex $argv 0]
81 #spawn /usr/lib/pandakit/console-rw $hostname
82-spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no ubuntu:Armada1@10.97.0.8
83+spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no ubuntu:Armada1@avocent-acs6048.ubuntu-ci
84 set timeout 300
85 expect {
86 -ex "Hit any key to stop autoboot:" {send "\n"}
87
88=== modified file 'kernel-sru/rsync-mini-iso.sh'
89--- kernel-sru/rsync-mini-iso.sh 2012-03-16 14:58:53 +0000
90+++ kernel-sru/rsync-mini-iso.sh 2013-11-08 20:32:10 +0000
91@@ -29,7 +29,7 @@
92 --interface='eth0' \
93 --mac='bc:30:5b:e2:a1:80' \
94 --ip-address='10.189.74.52' \
95- --kopts='priority=critical locale=en_US log_host=10.189.74.2 netcfg/choose_interface=auto log_port=514' \
96+ --kopts='priority=critical locale=en_US log_host=d-jenkins.ubuntu-ci netcfg/choose_interface=auto log_port=514' \
97 --ksmeta='kernelimage=linux-generic' \
98 --power-type='sentryswitch_cdu' \
99 --power-address='10.189.74.200' \
100@@ -42,7 +42,7 @@
101 --interface='eth0' \
102 --mac='bc:30:5b:e2:a1:7a' \
103 --ip-address='10.189.74.47' \
104- --kopts='priority=critical locale=en_US log_host=10.189.74.2 netcfg/choose_interface=auto log_port=514' \
105+ --kopts='priority=critical locale=en_US log_host=d-jenkins.ubuntu-ci netcfg/choose_interface=auto log_port=514' \
106 --ksmeta='kernelimage=linux-generic' \
107 --power-type='sentryswitch_cdu' \
108 --power-address='10.189.74.200' \
109@@ -55,7 +55,7 @@
110 --interface='eth0' \
111 --mac='bc:30:5b:e2:9e:f8' \
112 --ip-address='10.189.74.20' \
113- --kopts='priority=critical locale=en_US log_host=10.189.74.2 netcfg/choose_interface=auto log_port=514' \
114+ --kopts='priority=critical locale=en_US log_host=d-jenkins.ubuntu-ci netcfg/choose_interface=auto log_port=514' \
115 --ksmeta='kernelimage=linux-generic' \
116 --power-type='sentryswitch_cdu' \
117 --power-address='10.189.74.200' \
118@@ -68,7 +68,7 @@
119 --interface='eth0' \
120 --mac='bc:30:5b:e2:92:80' \
121 --ip-address='10.189.74.169' \
122- --kopts='priority=critical locale=en_US log_host=10.189.74.2 netcfg/choose_interface=auto log_port=514' \
123+ --kopts='priority=critical locale=en_US log_host=d-jenkins.ubuntu-ci netcfg/choose_interface=auto log_port=514' \
124 --ksmeta='kernelimage=linux-generic' \
125 --power-type='sentryswitch_cdu' \
126 --power-address='10.189.74.200' \

Subscribers

People subscribed via source and target branches

to all changes: