Allow changing DIB_RELEASE and add a job with CentOS 8
Change-Id: Ia0e3897ba414827fb81ba7ca7367e86899ea455a
This commit is contained in:
parent
c016bfbc48
commit
3be5066aa9
13
.zuul.yaml
13
.zuul.yaml
@ -67,6 +67,17 @@
|
|||||||
image_type: 'dib'
|
image_type: 'dib'
|
||||||
image_distro: 'centos7'
|
image_distro: 'centos7'
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: ironic-python-agent-check-image-dib-centos8
|
||||||
|
parent: ironic-python-agent-check-image-base
|
||||||
|
required-projects:
|
||||||
|
# NOTE(dtantsur): used for bindep only
|
||||||
|
- openstack/diskimage-builder
|
||||||
|
vars:
|
||||||
|
image_type: 'dib'
|
||||||
|
image_distro: 'centos-minimal'
|
||||||
|
image_release: 8
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-python-agent-check-image-dib-fedora
|
name: ironic-python-agent-check-image-dib-fedora
|
||||||
parent: ironic-python-agent-check-image-base
|
parent: ironic-python-agent-check-image-base
|
||||||
@ -112,6 +123,8 @@
|
|||||||
- ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
|
- ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
|
||||||
- ironic-python-agent-check-image-tinyipa
|
- ironic-python-agent-check-image-tinyipa
|
||||||
- ironic-python-agent-check-image-dib-centos7
|
- ironic-python-agent-check-image-dib-centos7
|
||||||
|
- ironic-python-agent-check-image-dib-centos8:
|
||||||
|
voting: false
|
||||||
- ironic-python-agent-check-image-dib-fedora:
|
- ironic-python-agent-check-image-dib-fedora:
|
||||||
voting: false
|
voting: false
|
||||||
- ironic-python-agent-check-image-dib-ubuntu:
|
- ironic-python-agent-check-image-dib-ubuntu:
|
||||||
|
@ -8,6 +8,15 @@
|
|||||||
"qemu-utils": "qemu-img",
|
"qemu-utils": "qemu-img",
|
||||||
"python-dev": "python3-devel"
|
"python-dev": "python3-devel"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"centos": {
|
||||||
|
"8": {
|
||||||
|
"tgt": "targetcli",
|
||||||
|
"curl": "curl",
|
||||||
|
"ironic-python-agent": "openstack-ironic-python-agent",
|
||||||
|
"qemu-utils": "qemu-img",
|
||||||
|
"python-dev": "python3-devel"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"family": {
|
"family": {
|
||||||
|
@ -42,6 +42,7 @@ def find_elements_path():
|
|||||||
def main():
|
def main():
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument("distribution", help="Distribution to use")
|
parser.add_argument("distribution", help="Distribution to use")
|
||||||
|
parser.add_argument("-r", "--release", help="Distribution release to use")
|
||||||
parser.add_argument("-o", "--output", help="Output base file name",
|
parser.add_argument("-o", "--output", help="Output base file name",
|
||||||
default="ironic-python-agent")
|
default="ironic-python-agent")
|
||||||
parser.add_argument("-e", "--element", action='append', default=[],
|
parser.add_argument("-e", "--element", action='append', default=[],
|
||||||
@ -54,6 +55,8 @@ def main():
|
|||||||
# size of the image.
|
# size of the image.
|
||||||
os.environ['DIB_INSTALLTYPE_pip_and_virtualenv'] = 'package'
|
os.environ['DIB_INSTALLTYPE_pip_and_virtualenv'] = 'package'
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
if args.release:
|
||||||
|
os.environ['DIB_RELEASE'] = args.release
|
||||||
try:
|
try:
|
||||||
subprocess.check_call(['disk-image-create', '-o', args.output,
|
subprocess.check_call(['disk-image-create', '-o', args.output,
|
||||||
'ironic-python-agent-ramdisk',
|
'ironic-python-agent-ramdisk',
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
image_distro: centos7
|
image_distro: centos7
|
||||||
|
image_release:
|
||||||
ipa_branch_path: '{{ zuul.branch | replace("/", "-") }}'
|
ipa_branch_path: '{{ zuul.branch | replace("/", "-") }}'
|
||||||
ipa_source_path: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
|
ipa_source_path: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
|
||||||
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
|
ipa_raw_dir: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent/UPLOAD_RAW'
|
||||||
|
@ -4,7 +4,9 @@
|
|||||||
|
|
||||||
- name: Build a DIB image
|
- name: Build a DIB image
|
||||||
command: |
|
command: |
|
||||||
ironic-python-agent-builder -o {{ image_name }} {{ image_distro }}
|
ironic-python-agent-builder -o {{ image_name }}
|
||||||
|
{{ "-r {}".format(image_release) if image_release else '' }}
|
||||||
|
{{ image_distro }}
|
||||||
environment:
|
environment:
|
||||||
# Increase from the default value of 30
|
# Increase from the default value of 30
|
||||||
DIB_DHCP_TIMEOUT: 60
|
DIB_DHCP_TIMEOUT: 60
|
||||||
|
Loading…
x
Reference in New Issue
Block a user