Correct building DIB images in the CI

* Install bindep from diskimage-builder in the DIB image job
* Switch to using ironic-python-agent-builder script
* Include distribution and branch name into target file names
* Place resulting files into correct directories
* Switch the distribution to centos7 since ubuntu seems to require
  additional configuration
* Add dhcp-all-interfaces, otherwise the image won't DHCP

Change-Id: I3f95323fa59bde4d4be6ff356e5e9f20b7cd453c

playbooks/ironic-python-agent-buildimage/pre-dib.yaml

@@ -0,0 +1,20 @@
+- hosts: all
+  tasks:
+
+    - name: Install binary dependencies from diskimage-builder
+      include_role:
+        name: bindep
+      vars:
+        bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/diskimage-builder'].src_dir }}"
+
+    - name: Install requirements for ironic-python-agent-builder
+      pip:
+        requirements: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ironic-python-agent-builder'].src_dir }}/requirements.txt"
+        extra_args: -c "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
+      become: true
+
+    - name: Install ironic-python-agent-builder
+      pip:
+        name: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ironic-python-agent-builder'].src_dir }}"
+        editable: true
+      become: true

playbooks/ironic-python-agent-buildimage/run.yaml

@@ -54,12 +54,10 @@
                   mv ipa-coreos*.tar.gz* UPLOAD_TAR
               ;;
               dib)
-                  sudo pip install diskimage-builder -c {{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt
+                  NAME=ipa-{{ image_distro }}-$BRANCH_PATH
-                  export IPA_SOURCE_DIR={{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent
+                  ironic-python-agent-builder -e dhcp-all-interfaces -o $NAME {{ image_distro }}
-                  pushd {{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent-builder/dib
+                  tar -czf UPLOAD_TAR/$NAME.tar.gz ${NAME}*
-                  ./build.sh ubuntu
+                  mv ${NAME}* "$IPA_SOURCE_DIR/UPLOAD_RAW"
-                  mv ironic-python-agent* "$IPA_SOURCE_DIR/UPLOAD_TAR"
-                  popd
               ;;
           esac
           ERRORS=0

zuul.d/ironic-python-agent-jobs.yaml

@@ -112,8 +112,13 @@
 - job:
     name: ironic-python-agent-buildimage-dib
     parent: ironic-python-agent-buildimage-base
+    pre-run: playbooks/ironic-python-agent-buildimage/pre-dib.yaml
+    required-projects:
+      # NOTE(dtantsur): used for bindep only
+      - openstack/diskimage-builder
     vars:
       image_name: 'dib'
+      image_distro: 'centos7'
 
 
 # Experimental jobs