Merge ~michihenning/jenkaas-jobs:fix-credentials-3 into jenkaas-jobs:master

Proposed by Michi Henning
Status: Rejected
Rejected by: Michi Henning
Proposed branch: ~michihenning/jenkaas-jobs:fix-credentials-3
Merge into: jenkaas-jobs:master
Diff against target: 20 lines (+3/-1)
1 file modified
jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh (+3/-1)
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Information
Review via email: mp+312001@code.launchpad.net

Commit message

Add missing add-apt-repository commands to credentials-3 job.

Description of the change

Add missing add-apt-repository commands to credentials-3 job.

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Hmm these same PPAs are added in prepare-0-install, think it makes sense to have the credentials-3- job independent of that?

I don't think buildd-staging is actually needed anyway.

review: Needs Information
Revision history for this message
Michi Henning (michihenning) wrote :

Hmmm... That is weird. Why did I get that error then? I ran the jobs in order on all the slaves.
I don't have a perfectly fresh slave around anymore to try an reproduce.

I'll reject this then. If it comes back, we can still do something about it then.

Unmerged commits

e4d00e4... by Michi Henning

Oops, need to be root.

5460cb0... by Michi Henning

Added missing add-apt-repositry commands for credentials-3.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
index 34b9c41..867ad51 100644
--- a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
+++ b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
@@ -2,6 +2,8 @@
2set -e2set -e
33
4# Setup the dependencies including tarmac4# Setup the dependencies including tarmac
5sudo add-apt-repository ppa:jenkaas-hackers/tools
6sudo add-apt-repository ppa:launchpad/buildd-staging
5sudo apt-get install -y python-launchpadlib python-bzrlib python-lockfile python-yaml tarmac jenkins-launchpad-plugin python-jenkins7sudo apt-get install -y python-launchpadlib python-bzrlib python-lockfile python-yaml tarmac jenkins-launchpad-plugin python-jenkins
68
7# Apply the configuration file.9# Apply the configuration file.
@@ -95,4 +97,4 @@ urls_to_hide: []
95# verbosity of the commands97# verbosity of the commands
96# one of: debug, info, warning, error, critical98# one of: debug, info, warning, error, critical
97log_level: debug99log_level: debug
98EOF
99\ No newline at end of file100\ No newline at end of file
101EOF

Subscribers

People subscribed via source and target branches

to all changes: