Merge lp:~psivaa/auto-package-testing/separate-boottest-datadir-creds into lp:~canonical-ci-engineering/auto-package-testing/add-boottest-requests

[Para Siva]

Use different datadir and credentials for boottesting even when deployed along with adt

This is to use different credentials and rc file for boottest requests even when boottesting is deployed along with adt.

[Joe Talbott (joetalbott)]

One in-line question.

review: Needs Information

[Paul Larson (pwlars)]

I guess we have to do this because they don't want credentials to overlap? Is this just a temporary thing? I don't know the back story on this completely, but the change looks ok.

review: Approve

[Vincent Ladeuil (vila)]

Same question as Joe, worth replying by a comment in the file itself ;-)

[lp:~psivaa/auto-package-testing/separate-boottest-datadir-creds]

403. By Para Siva on 2015-02-17

Comment about using the QA - adt apt cache

[Para Siva (psivaa)]

@Joe, replied inline. Basically it's intentional to have the same cache after production deployment.

@Paul: Yea the credentials used for adt has some issues with it. Although we could use the same adt creds after fixing them. The rationale for not going on that path is that at the moment we're not responsible for that deployment.

[Vincent Ladeuil (vila)]

<psivaa> vila: yea, we're going to use the same apt cache. i've added a comment to that effect

<psivaa> vila: i'm saying that we *can share the credentials and also have our own creds for that.. datadir has to be different as you pointed out earlier

Ack

review: Approve

=== added file 'etc/boottest-britney.rc'
--- etc/boottest-britney.rc	1970-01-01 00:00:00 +0000
+++ etc/boottest-britney.rc	2015-02-17 14:45:24 +0000
@@ -0,0 +1,9 @@
+# Default configuration file for adt-britney
+# This file should be placed under
+# /var/lib/jenkins/CI/
+# But using the adt apt cache in order to avoid 
+# the disk filling up
+aptroot: /var/lib/jenkins/QA/adt/aptroot
+apturi: http://ftpmaster.internal/ubuntu/
+components: main restricted universe multiverse
+datadir: /var/local/boottest/

=== modified file 'jenkins/run-boottest-jenkins.py'
--- jenkins/run-boottest-jenkins.py	2015-02-16 10:14:40 +0000
+++ jenkins/run-boottest-jenkins.py	2015-02-17 14:45:24 +0000
@@ -55,8 +55,8 @@
     cmd = ['python',
            os.path.join(CWD, 'adt-jenkins'),
            '-dbP',
-           '-c', os.path.expanduser('~/QA/adt-britney.rc'),
-           '-J', os.path.expanduser('~/.adt.credentials'),
+           '-c', os.path.expanduser('~/CI/boottest-britney.rc'),
+           '-J', os.path.expanduser('~/.boottest.credentials'),
            '-r', release,
            '--submit', statefile]
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,