X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ci%2Fsite_jenkins.yaml;h=b76c8a29ad413391a2234a486d6ba1a014c5a254;hb=8fcb874a6e5ec52b4a6ac80cb7f34c7baccd8c17;hp=1510fc8bf1de5a159dd62389fcf31b71cd1f37ee;hpb=0e03f090b02ca0ee5f2d85d1e7b32f40ef4e10c7;p=icn.git

diff --git a/ci/site_jenkins.yaml b/ci/site_jenkins.yaml
index 1510fc8..b76c8a2 100644
--- a/ci/site_jenkins.yaml
+++ b/ci/site_jenkins.yaml
@@ -1,89 +1,9 @@
 - hosts: localhost
-  vars:
-    jenkins_hostname: "{{ ansible_default_ipv4.address }}"
-    jenkins_version: 2.192
-    jenkins_plugin_timeout: 360
-    jenkins_plugins:
-      - gerrit-trigger
-      - workflow-aggregator
-      - git
   roles:
     - role: geerlingguy.java
       become: yes
     - role: geerlingguy.jenkins
       become: yes
-  tasks:
-    - name: restart jenkins to use new installed plugins
-      meta: flush_handlers
-
-    - name: Wait for Jenkins to start up before proceeding.
-      command: >
-        curl -D - --silent --max-time 5 http://{{ jenkins_hostname }}:{{ jenkins_http_port }}{{ jenkins_url_prefix }}/cli/
-      args:
-        warn: false
-      register: result
-      until: >
-        (result.stdout.find("403 Forbidden") != -1)
-        or (result.stdout.find("200 OK") != -1)
-        and (result.stdout.find("Please wait while") == -1)
-      retries: "{{ jenkins_connection_retries | default(60) }}"
-      delay: "{{ jenkins_connection_delay | default(5) }}"
-      changed_when: false
-      check_mode: false
-
-    - name: create directory /var/lib/jenkins/.ssh
-      file:
-        path: /var/lib/jenkins/.ssh
-        owner: jenkins
-        group: jenkins
-        state: directory
-
-    - name: place gerrit ssh key
-      copy:
-        src: "{{ gerrit_key_path | default('gerrit.key') }}"
-        dest: /var/lib/jenkins/.ssh/gerrit.key
-        owner: jenkins
-        group: jenkins
-        mode: '0600'
-      tags: [gerrit]
-
-    - name: grant jenkins user sudo
-      copy:
-        content: "jenkins        ALL=(ALL)       NOPASSWD: ALL"
-        dest: /etc/sudoers.d/jenkins
-        owner: root
-        group: root
-        mode: '0660'
-      tags: [gerrit]
-
-    - name: add gerrit server
-      jenkins_script:
-        script: "{{lookup('file', 'gerrit.groovy')}}"
-        url: "http://{{ jenkins_hostname }}:{{ jenkins_http_port }}{{ jenkins_url_prefix }}"
-        user: "{{ jenkins_admin_username }}"
-        password: "{{ jenkins_admin_password }}"
-        validate_certs: no
-      register: result
-      failed_when: "'Result: success\n' != result.output"
-      tags: [gerrit]
-
-    - name: Install python-pip
-      apt:
-        name: python-pip
-      tags: [jobs]
-
-    - name: Install python-jenkins and lxml(required by jenkins_job module)
-      pip:
-        name:
-          - python-jenkins
-          - lxml
-      tags: [jobs]
-
-    - name: Add pipeline job for ICN CI
-      jenkins_job:
-        name: icn_check
-        config: "{{lookup('file', 'icn_check.xml')}}"
-        url: "http://{{ jenkins_hostname }}:{{ jenkins_http_port }}{{ jenkins_url_prefix }}"
-        user: "{{ jenkins_admin_username }}"
-        password: "{{ jenkins_admin_password }}"
-      tags: [jobs]
+    - role: jenkins-config
+      become: yes
+      tags: [jenkins-config]