Merge ~maxiberta/ols-jenkaas:job-builder-setup-updates into ols-jenkaas:main

[Maximiliano Bertacchini]

Assorted fixes related to the builder container setup

[Guillermo Gonzalez (verterok)]

Thanks! looks good, one question (see inline)

review: Needs Information

[Guillermo Gonzalez (verterok)]

review: Approve

[Guillermo Gonzalez (verterok)]

thanks

review: Approve

diff --git a/README.rst b/README.rst
index ec1e762..224a237 100644
--- a/README.rst
+++ b/README.rst
@@ -30,7 +30,7 @@ Production
 ==========
 
 ols-jenkaas is deployed in production at:
-https://jenkins.ols.canonical.com/online-services/
+https://jenkins.ols.ps5.canonical.com/
 
 The internal access (requires VPN) to create/update jobs is at:
 http://online-services-jenkins-be.internal:8080/online-services/
@@ -97,7 +97,7 @@ Setting up ``ols-job-builder`` requires the credentials for
 
 Authenticating is a bit of a challenge, as ols-jb-bot can't get past
 apache-openid. First, log into login.ubuntu.com as yourself, then visit
-https://jenkins.ols.canonical.com/ to get a cookie for apache-openid. Once
+https://jenkins.ols.ps5.canonical.com/ to get a cookie for apache-openid. Once
 there, log out of login.ubuntu.com, grab ols-jb-bot's credentials from enigma,
 then hit Jenkins' "log in" button to log in as ols-jb-bot. From there, you can
 go to the configure page for this user, reveal and copy the API token and
@@ -113,7 +113,7 @@ You're now ready to create your job builder::
 You're good to go, edit job descriptions under 'jobs/', raise an MP and get it 
 merged. Then log into the new `ols-job-builder` container and do::
 
-  $ ubuntu@ols-job-builder:~/jenkaas$ bzr pull
+  $ ubuntu@ols-job-builder:~/jenkaas$ git pull
   $ ubuntu@ols-job-builder:~/jenkaas$ jenkins-jobs update --delete-old jobs/
 
 Note: This a WIP and only applies to members of
diff --git a/ols-vms.conf b/ols-vms.conf
index 07e88db..c90c607 100644
--- a/ols-vms.conf
+++ b/ols-vms.conf
@@ -70,7 +70,7 @@ apt.sources = ppa:ubuntuone/ols-tests
 # python3-jenkins-job-builder still doesn't work properly
 # https://bugs.launchpad.net/python-jenkins/+bug/1501441 is blocking the
 # migration to zesty
-vm.packages =  bzr, python3-jenkins-job-builder, python3-pip, python3-setuptools, python3-ols-tests, python3-ols-config
+vm.packages =  bzr, python3-jenkins-job-builder, python3-pip, python3-setuptools, python3-ols-tests, python3-ols-config, python3-wheel
 vm.setup_scripts = setup/job-builder
 
 #
diff --git a/setup/job-builder b/setup/job-builder
index 16da9c4..905555b 100755
--- a/setup/job-builder
+++ b/setup/job-builder
@@ -5,7 +5,7 @@
 
 # We need to run jenkins_jobs from pip to get the bzr scm :-/
 LC_ALL=C pip3 install --user jenkins-job-builder==2.10.1
-LC_ALL=C pip3 install --user git+https://github.com/jovandeginste/jenkins-jobs-mattermost.git
+LC_ALL=C pip3 install --user git+https://github.com/verterok/jenkins-jobs-mattermost.git
 
 CONF_DIR=~/.config/jenkins_jobs
 mkdir -p $CONF_DIR
@@ -51,9 +51,7 @@ EOCSE
 
 # The jenkaas branch itself.  For testing, the branch has been pushed from
 # the host, for production we pull from the public branch.
-if [ ! -d jenkaas ] ; then
-    git clone {{jenkaas}.jobs} jenkaas
-fi
+echo "NOTE: now please get a copy/clone of {{jenkaas}.jobs} under ~/jenkaas"
 
 # Inject context from the host