openstack/ironic-python-agent-builder
Code Issues Proposed changes

Clean up the ansible playbooks

Browse Source 
Change-Id: I7514368c591fb7cb445207a96c966275896ba4d5
This commit is contained in:
Dmitry Tantsur 2019-09-03 17:43:26 +02:00
parent d768c3becd
commit 396eca61bc
4 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.yaml
View File

@ -9,6 +9,9 @@
- openstack/requirements - openstack/requirements
- openstack/ironic-python-agent - openstack/ironic-python-agent
- openstack/ironic-python-agent-builder - openstack/ironic-python-agent-builder
vars:
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
ipa_tar_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_TAR'
- job: - job:
name: ironic-python-agent-build-image-tinyipa name: ironic-python-agent-build-image-tinyipa
@ -44,6 +47,9 @@
- ^test-requirements.txt$ - ^test-requirements.txt$
- ^tools/.*$ - ^tools/.*$
- ^tox.ini$ - ^tox.ini$
vars:
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
ipa_tar_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_TAR'
- job: - job:
name: ironic-python-agent-check-image-tinyipa name: ironic-python-agent-check-image-tinyipa

8
playbooks/ironic-python-agent-build-image/post.yaml
View File

@ -1,9 +1,5 @@
- hosts: all - hosts: all
vars:
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
ipa_tar_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_TAR'
tasks: tasks:
- name: Ensure artifacts directory exists - name: Ensure artifacts directory exists
@ -12,7 +8,7 @@
state: directory state: directory
delegate_to: localhost delegate_to: localhost
- name: Copy files from {{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent on node - name: Copy files from {{ ipa_raw_dir }} on node
synchronize: synchronize:
src: '{{ ipa_raw_dir }}/' src: '{{ ipa_raw_dir }}/'
dest: '{{ zuul.executor.work_root }}/artifacts/{{ image_type }}/files/' dest: '{{ zuul.executor.work_root }}/artifacts/{{ image_type }}/files/'
@ -23,7 +19,7 @@
- --include=/* - --include=/*
- --prune-empty-dirs - --prune-empty-dirs
- name: Copy files from {{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent on node - name: Copy files from {{ ipa_tar_dir }} on node
synchronize: synchronize:
src: '{{ ipa_tar_dir }}/' src: '{{ ipa_tar_dir }}/'
dest: '{{ zuul.executor.work_root }}/artifacts/{{ image_type }}/' dest: '{{ zuul.executor.work_root }}/artifacts/{{ image_type }}/'

13
playbooks/ironic-python-agent-build-image/run.yaml
View File

@ -1,9 +1,5 @@
- hosts: all - hosts: all
vars:
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
ipa_tar_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_TAR'
tasks: tasks:
- name: Create a target directory for raw images - name: Create a target directory for raw images
@ -16,10 +12,5 @@
path: '{{ ipa_tar_dir }}' path: '{{ ipa_tar_dir }}'
state: directory state: directory
- import_role: - include_role:
name: ipa-build-tinyipa-image name: ipa-build-{{ image_type }}-image
when: image_type == 'tinyipa'
- import_role:
name: ipa-build-dib-image
when: image_type == 'dib'

7
roles/ipa-build-dib-image/tasks/install.yaml
View File

@ -4,13 +4,8 @@
vars: vars:
bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/diskimage-builder'].src_dir }}" 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 - name: Install ironic-python-agent-builder
pip: pip:
name: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ironic-python-agent-builder'].src_dir }}" name: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ironic-python-agent-builder'].src_dir }}"
extra_args: -c "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
become: true become: true