misc

Author: adriaanm

roles/common/tasks/main.yml

@@ -9,8 +9,9 @@
       - szeiger
 
 - name: Install basic packages
-  apt: name={{item}} state=installed
+  apt: name={{item}} state=present
   with_items:
+       - acl # so that become_user works (uses setfacl)
        - apt-transport-https
        - openjdk-8-jdk
        - git

roles/jenkins/tasks/main.yml

@@ -34,7 +34,6 @@
   with_items:
       - "{{jenkins_home}}/.ssh"
 
-# hmm, this fails on initial bootstrap, even though create jenkins user step is above
 - name: Worker ssh key pairs
   become_user: "{{jenkins_user}}"
   become: yes
@@ -53,16 +52,17 @@
       state: present
       update_cache: yes
 
+# TODO: enable, but currently commented out to make sure we don't override jenkins config (it's not tracked automatically)
 # After making changes on jenkins, make sure to incorporate them back into this repo
 # using `rsync -av --existing jenkins@scala-ci.typesafe.com:~/ roles/jenkins/files`,
 # or they will be overwritten by this step from the files in roles/jenkins/files.
-- name: Copy jenkins config
-  become_user: "{{jenkins_user}}"
-  become: yes
-  synchronize:
-    src: ../files/
-    dest: "{{jenkins_home}}"
-    checksum: true
-    rsync_opts:
-      - "--chown={{jenkins_user}}:{{jenkins_user}}" # requires recent rsync!
-  notify: restart jenkins
+# - name: Copy jenkins config
+#   become_user: "{{jenkins_user}}"
+#   become: yes
+#   synchronize:
+#     src: ../files/
+#     dest: "{{jenkins_home}}"
+#     checksum: true
+#     rsync_opts:
+#       - "--chown={{jenkins_user}}:{{jenkins_user}}" # requires recent rsync!
+#   notify: restart jenkins

site.yml

@@ -42,15 +42,15 @@
     - worker
 
 # To create the inital jenkins config, use `ansible-playbook site.yml --tags boot_jenkins` (after first doing a normal run)
-# - name: Bootstrap jenkins
-#   hosts: master
-#   gather_facts: yes
-#   remote_user: "{{admin_user}}"
-#   become: true
-#   tasks:
-#     - include_tasks: roles/jenkins/tasks/bootstrap.yml
-#   tags:
-#     - boot_jenkins
+- name: Bootstrap jenkins
+  hosts: master
+  gather_facts: yes
+  remote_user: "{{admin_user}}"
+  become: true
+  tasks:
+    - include_tasks: roles/jenkins/tasks/bootstrap.yml
+  tags:
+    - boot_jenkins
 
 - name: Finish jenkins bootstrap using jenkins cli
   hosts: localhost
@@ -59,5 +59,5 @@
   become: false
   tasks:
     - include_tasks: roles/jenkins/tasks/bootstrap-cli.yml
-  # tags:
-  #   - boot_jenkins
+  tags:
+    - boot_jenkins