Preliminary work to support CentOS 9 Stream
Changes package mappings to default to Python 3. Unfortunately, the build does not work yet because of some issue in DIB. Co-Authored-By: Dmitry Tantsur <dtantsur@protonmail.com> Change-Id: I88c1ec2590d280745daa6c8b3aa9a719f5d96e72
This commit is contained in:
		
				
					committed by
					
						
						Dmitry Tantsur
					
				
			
			
				
	
			
			
			
						parent
						
							f21e6dddfc
						
					
				
				
					commit
					09dcdedf00
				
			@@ -1,17 +1,22 @@
 | 
			
		||||
{
 | 
			
		||||
  "release": {
 | 
			
		||||
    "rhel": {
 | 
			
		||||
      "8": {
 | 
			
		||||
        "python-hardware": "python3-hardware-detect"
 | 
			
		||||
      "7": {
 | 
			
		||||
        "python-hardware": "python-hardware"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "centos": {
 | 
			
		||||
      "8": {
 | 
			
		||||
        "python-hardware": "python3-hardware-detect"
 | 
			
		||||
      "7": {
 | 
			
		||||
        "python-hardware": "python-hardware"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "family": {
 | 
			
		||||
    "redhat": {
 | 
			
		||||
      "python-hardware": "python3-hardware-detect"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "default": {
 | 
			
		||||
    "python-hardware": "python-hardware"
 | 
			
		||||
    "python-hardware": "python3-hardware"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,41 +1,30 @@
 | 
			
		||||
{
 | 
			
		||||
  "release": {
 | 
			
		||||
    "rhel": {
 | 
			
		||||
      "8": {
 | 
			
		||||
        "tgt": "target-restore",
 | 
			
		||||
        "python": "python3",
 | 
			
		||||
        "python-dev": "python3-devel"
 | 
			
		||||
      "7": {
 | 
			
		||||
        "python": "python",
 | 
			
		||||
        "python-dev": "python-devel",
 | 
			
		||||
        "tgt": "scsi-target-utils"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "centos": {
 | 
			
		||||
      "8": {
 | 
			
		||||
        "tgt": "target-restore",
 | 
			
		||||
        "python": "python3",
 | 
			
		||||
        "python-dev": "python3-devel"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "ubuntu": {
 | 
			
		||||
      "bionic": {
 | 
			
		||||
        "python": "python3",
 | 
			
		||||
        "python-dev": "python3-dev"
 | 
			
		||||
      "7": {
 | 
			
		||||
        "python": "python",
 | 
			
		||||
        "python-dev": "python-devel",
 | 
			
		||||
        "tgt": "scsi-target-utils"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "family": {
 | 
			
		||||
    "redhat": {
 | 
			
		||||
      "tgt": "scsi-target-utils",
 | 
			
		||||
      "libffi-dev": "libffi-devel",
 | 
			
		||||
      "libssl-dev": "openssl-devel",
 | 
			
		||||
      "python-dev": "python3-devel",
 | 
			
		||||
      "qemu-utils": "qemu-img",
 | 
			
		||||
      "python-dev": "python-devel"
 | 
			
		||||
    },
 | 
			
		||||
    "debian": {
 | 
			
		||||
      "python": "python3",
 | 
			
		||||
      "python-dev": "python3-dev"
 | 
			
		||||
      "tgt": "target-restore"
 | 
			
		||||
    },
 | 
			
		||||
    "suse": {
 | 
			
		||||
      "qemu-utils": "qemu",
 | 
			
		||||
      "python": "python3",
 | 
			
		||||
      "genisoimage": "mkisofs",
 | 
			
		||||
      "gdisk": "gptfdisk",
 | 
			
		||||
      "libffi-dev": "libffi-devel",
 | 
			
		||||
@@ -46,6 +35,8 @@
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "default": {
 | 
			
		||||
    "ironic-python-agent": "openstack-ironic-python-agent"
 | 
			
		||||
    "ironic-python-agent": "openstack-ironic-python-agent",
 | 
			
		||||
    "python": "python3",
 | 
			
		||||
    "python-dev": "python3-dev"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -112,6 +112,23 @@
 | 
			
		||||
    vars:
 | 
			
		||||
      extra_elements: ["extra-hardware"]
 | 
			
		||||
 | 
			
		||||
- job:
 | 
			
		||||
    name: ironic-python-agent-check-image-dib-centos9
 | 
			
		||||
    parent: ironic-python-agent-check-image-base
 | 
			
		||||
    required-projects:
 | 
			
		||||
      - openstack/diskimage-builder
 | 
			
		||||
    vars:
 | 
			
		||||
      image_type: 'dib'
 | 
			
		||||
      image_distro: 'centos'
 | 
			
		||||
      image_release: '9-stream'
 | 
			
		||||
      image_target_name: centos9
 | 
			
		||||
 | 
			
		||||
- job:
 | 
			
		||||
    name: ironic-python-agent-check-image-dib-centos9-extra
 | 
			
		||||
    parent: ironic-python-agent-check-image-dib-centos9
 | 
			
		||||
    vars:
 | 
			
		||||
      extra_elements: ["extra-hardware"]
 | 
			
		||||
 | 
			
		||||
- job:
 | 
			
		||||
    name: ironic-python-agent-check-image-dib-opensuse
 | 
			
		||||
    parent: ironic-python-agent-check-image-base
 | 
			
		||||
 
 | 
			
		||||
@@ -49,3 +49,9 @@
 | 
			
		||||
            branches: master
 | 
			
		||||
        - ironic-python-agent-build-image-dib-debian:
 | 
			
		||||
            branches: master
 | 
			
		||||
    experimental:
 | 
			
		||||
      jobs:
 | 
			
		||||
        - ironic-python-agent-check-image-dib-centos9:
 | 
			
		||||
            voting: false
 | 
			
		||||
        - ironic-python-agent-check-image-dib-centos9-extra:
 | 
			
		||||
            voting: false
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user