ubiquity

Merge lp:~psivaa/ubiquity/local-deployment-fixes into lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing

  1. local-deployment-fixes
  2. Merge into ubiquity-ci-testing
Proposed by Para Siva
Status: Merged
Merged at revision: 6267
Proposed branch: lp:~psivaa/ubiquity/local-deployment-fixes
Merge into: lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing
Diff against target: 53 lines (+6/-4)
3 files modified
autopilot/README.md (+3/-1)
autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg (+1/-1)
autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml (+2/-2)
To merge this branch: bzr merge lp:~psivaa/ubiquity/local-deployment-fixes
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+250037@code.launchpad.net

Commit message

The changes required for local deployment.

Description of the change

The changes needed for local deployment. I do not see this will be much different for other deployments.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/README.md'
2--- autopilot/README.md 2013-11-22 14:29:50 +0000
3+++ autopilot/README.md 2015-02-17 16:55:02 +0000
4@@ -116,6 +116,7 @@
5 handling to run multiple time in parallel.
6
7 $ bzr cat lp:ubuntu-server-iso-testing/download-latest-test-iso.py > ~/bin/download-latest-test-iso.py
8+ $ chmod 755 ~/bin/download-latest-test-iso.py
9
10 * Create the following links in ~/bin/
11
12@@ -138,7 +139,8 @@
13
14 * Create the same symlinks than symlinks in `/home/ubiquity/bin/`
15
16- $ find /home/ubiquity/bin/ ! -type d -exec ln -s {} $HOME/bin/
17+ $ find /home/ubiquity/bin/ ! -type d -exec ln -s {} $HOME/bin/ \;
18+ $ ln -s /home/ubiquity/ubiquity/autopilot/ubiquity-autopilot-runner/ ubiquity-autopilot-runner
19
20 * **Logout** from user jenkins
21
22
23=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg'
24--- autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg 2014-03-28 15:25:31 +0000
25+++ autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg 2015-02-17 16:55:02 +0000
26@@ -1,4 +1,4 @@
27-node: rabisu
28+node: master
29 flavor: ubuntu
30 variant: desktop
31 cdimageurl: http://cdimage.ubuntu.com/daily-live/pending/
32
33=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml'
34--- autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml 2013-12-20 08:15:37 +0000
35+++ autopilot/ubiquity-autopilot-runner/jenkins/templates/ubiquity_ap-flavor_devel_daily-test.xml 2015-02-17 16:55:02 +0000
36@@ -40,7 +40,7 @@
37 <hudson.matrix.LabelAxis>
38 <name>label</name>
39 <values>
40- <string>rabisu</string>
41+ <string>{{ node }}</string>
42 </values>
43 </hudson.matrix.LabelAxis>
44 </axes>
45@@ -51,7 +51,7 @@
46
47 RELEASE=$(distro-info -d||distro-info -s)
48 VARIANT={{ variant }}
49-ISO=$JENKINS_HOME/iso/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
50+ISO=$JENKINS_HOME/isos/{{ flavor }}/${RELEASE}-${VARIANT}-${ARCH}.iso
51 TESTNAME={{ testcase }}
52
53 if [ ! -f &quot;$ISO&quot; ]; then

Subscribers

People subscribed via source and target branches