Merge ~saviq/jenkaas-jobs:verify-jenkins-creds into jenkaas-jobs:master

[Michał Sawicz]

[Michi Henning (michihenning)]

This is really useful, thank you!

review: Approve

diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-0.py b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-0.py
 new file mode 100644
index 0000000..c5308bd
--- /dev/null
+++ b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-0.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import os
+import requests
+import sys
+
+if __name__ == '__main__':
+    resp = requests.get('{backend_url}', auth=('{bot_username}', os.environ['jenkins_api_token']))
+    if resp.status_code == 200:
+        print("INFO: Authenticated as: {bot_username}")
+    else:
+        print("Authentication as {bot_username} failed:")
+        print("ERROR: {{}}: {{}}".format(resp.status_code, resp.reason))
+        sys.exit(1)
+
diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-1.sh b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-1.sh
 new file mode 100644
index 0000000..34b9c41
--- /dev/null
+++ b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin-1.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+set -e
+
+# Setup the dependencies including tarmac
+sudo apt-get install -y python-launchpadlib python-bzrlib python-lockfile python-yaml tarmac jenkins-launchpad-plugin python-jenkins
+
+# Apply the configuration file.
+CONFIG_DIR="${{JENKINS_HOME}}/.jlp"
+CONFIG_PATH="${{CONFIG_DIR}}/jlp.config"
+
+if [ ! -d "${{CONFIG_DIR}}" ]; then
+    mkdir -p "${{CONFIG_DIR}}"
+fi
+
+cat > "${{CONFIG_PATH}}" << EOF
+#You must explicitely allow users to trigger the jobs on your jenkins
+#Otherwise anybody can run arbitrary code on your jenkins servers.
+allowed_users: [{allowed_users}]
+
+#path to your credentials file. The first time you run one of these scripts,
+#launchpad will ask you to authenticate (via a provided URL). Once you do so
+#(in launchpad) you won't need to do this again.
+#If your jenkins "lives" in /var/lib/jenkins you probably don't need to change
+#this
+credential_store_path: {credentials_path}
+
+# When doing a dput into ppa (in autoland.py) a new changelog entry is
+# generated. DEBEMAIL and DEBFULLNAME are used to generate the entry correctly.
+# Please note that the gpg keys of the user specified here must be available
+# on the host where autoland.py is running
+DEBEMAIL:
+DEBFULLNAME:
+
+#user and password for accessing jenkins. This is needed as we need to find
+#out if a job is being published to public jenkins or not. The user needs to be
+#able to see the job configuration
+jenkins_user: "{bot_username}"
+jenkins_password: "${{jenkins_api_token}}"
+
+#Actual URL of your jenkins (e.g. the jenkins backend URL) 
+jenkins_url: "{backend_url}"
+
+#Proxy URL of your jenkins (e.g. the URL accessed by users)
+jenkins_proxy_url: "${{JENKINS_URL}}"
+
+#Token to pass when triggering a jenkins build (leave blank for none)
+jenkins_build_token: "BUILD_ME"
+
+# console output from the following jobs will not be printed to the
+# affected merge proposal (in the "Executed test runs:" section)
+jobs_blacklisted_from_messages:
+{blacklisted_jobs}
+
+#message that is used for "testing in progress" comment
+launchpad_build_in_progress_message: "Jenkins: testing in progress"
+
+#login of the launchpad user you will be using for this plugin
+#ideally this user is part of your project group
+launchpad_login: {bot_username}
+
+#Review type that is used for voting on merge proposals.
+#Usually you don't need to change this
+launchpad_review_type: continuous-integration
+
+# directory containing lockfiles for Launchpad merge proposals
+launchpadlocks_dir: /tmp/jenkins-launchpad-plugin/locks
+
+#lock file that is being used to limit the number of parallel launchpad
+#connections
+lock_name: launchpad-trigger-lock
+
+#you don't need to change this
+lp_app: launchpad-trigger
+
+#which launchpad are you using (production/staging)
+#you don't need to change this
+lp_env: production
+
+#URL of your public jenkins in case you are publishing your jobs to some
+#other jenkins
+public_jenkins_url:
+
+#in case you are running jenkins in a private infrastructure you probably don't
+#want to expose your private IPs in public merge proposals
+#the following defines (IP, replacement) pairs. Your URLs in merge proposals
+#are then replaced by the replacement (and you can e.g. edit your /etc/hosts
+#so the links still work for you). The form to specify a replacement is:
+#urls_to_hide:
+# - ['http://1.2.3.4:8080','http://jenkins:8080']
+#
+#To specify no replacement:
+#urls_to_hide: []
+urls_to_hide: []
+
+# verbosity of the commands
+# one of: debug, info, warning, error, critical
+log_level: debug
+EOF
 \ No newline at end of file
diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
 deleted file mode 100644
index 34b9c41..0000000
--- a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-set -e
-
-# Setup the dependencies including tarmac
-sudo apt-get install -y python-launchpadlib python-bzrlib python-lockfile python-yaml tarmac jenkins-launchpad-plugin python-jenkins
-
-# Apply the configuration file.
-CONFIG_DIR="${{JENKINS_HOME}}/.jlp"
-CONFIG_PATH="${{CONFIG_DIR}}/jlp.config"
-
-if [ ! -d "${{CONFIG_DIR}}" ]; then
-    mkdir -p "${{CONFIG_DIR}}"
-fi
-
-cat > "${{CONFIG_PATH}}" << EOF
-#You must explicitely allow users to trigger the jobs on your jenkins
-#Otherwise anybody can run arbitrary code on your jenkins servers.
-allowed_users: [{allowed_users}]
-
-#path to your credentials file. The first time you run one of these scripts,
-#launchpad will ask you to authenticate (via a provided URL). Once you do so
-#(in launchpad) you won't need to do this again.
-#If your jenkins "lives" in /var/lib/jenkins you probably don't need to change
-#this
-credential_store_path: {credentials_path}
-
-# When doing a dput into ppa (in autoland.py) a new changelog entry is
-# generated. DEBEMAIL and DEBFULLNAME are used to generate the entry correctly.
-# Please note that the gpg keys of the user specified here must be available
-# on the host where autoland.py is running
-DEBEMAIL:
-DEBFULLNAME:
-
-#user and password for accessing jenkins. This is needed as we need to find
-#out if a job is being published to public jenkins or not. The user needs to be
-#able to see the job configuration
-jenkins_user: "{bot_username}"
-jenkins_password: "${{jenkins_api_token}}"
-
-#Actual URL of your jenkins (e.g. the jenkins backend URL) 
-jenkins_url: "{backend_url}"
-
-#Proxy URL of your jenkins (e.g. the URL accessed by users)
-jenkins_proxy_url: "${{JENKINS_URL}}"
-
-#Token to pass when triggering a jenkins build (leave blank for none)
-jenkins_build_token: "BUILD_ME"
-
-# console output from the following jobs will not be printed to the
-# affected merge proposal (in the "Executed test runs:" section)
-jobs_blacklisted_from_messages:
-{blacklisted_jobs}
-
-#message that is used for "testing in progress" comment
-launchpad_build_in_progress_message: "Jenkins: testing in progress"
-
-#login of the launchpad user you will be using for this plugin
-#ideally this user is part of your project group
-launchpad_login: {bot_username}
-
-#Review type that is used for voting on merge proposals.
-#Usually you don't need to change this
-launchpad_review_type: continuous-integration
-
-# directory containing lockfiles for Launchpad merge proposals
-launchpadlocks_dir: /tmp/jenkins-launchpad-plugin/locks
-
-#lock file that is being used to limit the number of parallel launchpad
-#connections
-lock_name: launchpad-trigger-lock
-
-#you don't need to change this
-lp_app: launchpad-trigger
-
-#which launchpad are you using (production/staging)
-#you don't need to change this
-lp_env: production
-
-#URL of your public jenkins in case you are publishing your jobs to some
-#other jenkins
-public_jenkins_url:
-
-#in case you are running jenkins in a private infrastructure you probably don't
-#want to expose your private IPs in public merge proposals
-#the following defines (IP, replacement) pairs. Your URLs in merge proposals
-#are then replaced by the replacement (and you can e.g. edit your /etc/hosts
-#so the links still work for you). The form to specify a replacement is:
-#urls_to_hide:
-# - ['http://1.2.3.4:8080','http://jenkins:8080']
-#
-#To specify no replacement:
-#urls_to_hide: []
-urls_to_hide: []
-
-# verbosity of the commands
-# one of: debug, info, warning, error, critical
-log_level: debug
-EOF
 \ No newline at end of file
diff --git a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.yaml b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.yaml
index 926463b..ae0bd4f 100644
--- a/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.yaml
+++ b/jenkaas_jobs/yaml/credentials/credentials-3-launchpad-plugin.yaml
@@ -22,4 +22,9 @@
     - timestamps
     builders:
       - shell:
-          !include-raw: credentials-3-launchpad-plugin.sh
+          !include-raw: credentials-3-launchpad-plugin-0.py
+      - shell:
+          !include-raw: credentials-3-launchpad-plugin-1.sh
+    publishers:
+      - description_setter:
+          set_for_matrix: 'true'
diff --git a/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml b/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
index ac7a8be..3c5dd4d 100644
--- a/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
+++ b/tests/fixtures/credentials/credentials-3-launchpad-plugin.xml
@@ -49,6 +49,24 @@
   </axes>
   <builders>
     <hudson.tasks.Shell>
+      <command>#!/usr/bin/env python
+
+import os
+import requests
+import sys
+
+if __name__ == '__main__':
+    resp = requests.get('http://your-jenkins-be.internal:8080/', auth=('test-ci-bot', os.environ['jenkins_api_token']))
+    if resp.status_code == 200:
+        print(&quot;INFO: Authenticated as: test-ci-bot&quot;)
+    else:
+        print(&quot;Authentication as test-ci-bot failed:&quot;)
+        print(&quot;ERROR: {}: {}&quot;.format(resp.status_code, resp.reason))
+        sys.exit(1)
+
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
       <command>#!/bin/bash
 set -e
 
@@ -151,7 +169,13 @@ log_level: debug
 EOF</command>
     </hudson.tasks.Shell>
   </builders>
-  <publishers/>
+  <publishers>
+    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+      <regexp>^INFO:\s+(.*)</regexp>
+      <regexpForFailed>(^(ERROR|WARNING):\s+.*)</regexpForFailed>
+      <setForMatrix>true</setForMatrix>
+    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+  </publishers>
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
   </buildWrappers>