]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
set the macros after installing dependencies 297/head
authorAlfredo Deza <adeza@redhat.com>
Fri, 15 Jan 2016 14:18:25 +0000 (09:18 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 15 Jan 2016 14:18:25 +0000 (09:18 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ansible/slave.yml.j2

index 341772725d396d9fee47c0d354310dff703602a3..8362f3d87e5269ff5cfdafe00a130a6a7acd6897 100644 (file)
     - name: ensure the build dir has the right owner permissions
       file: path=/home/{{ jenkins_user }}/build state=directory owner={{ jenkins_user }}
 
-    - name: ensure the rpmmacros file exists to fix centos builds
-      file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch
-
-    - name: write the rpmmacros needed in centos
-      lineinfile:
-        dest: "/home/{{ jenkins_user }}/.rpmmacros"
-        regexp: '^%dist'
-        line: '%dist .el{{ ansible_lsb.major_release }}'
-      when: ansible_pkg_mgr  == "yum"
-
     - name: Install RPM requirements
       sudo: yes
       yum: name={{ item }} state=present
         - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
+    - name: ensure the rpmmacros file exists to fix centos builds
+      file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch
+
+    - name: write the rpmmacros needed in centos
+      lineinfile:
+        dest: "/home/{{ jenkins_user }}/.rpmmacros"
+        regexp: '^%dist'
+        line: '%dist .el{{ ansible_lsb.major_release }}'
+      when: ansible_pkg_mgr  == "yum"
+
     - name: install six, latest one
       sudo: true
       pip: name=six state=latest