Skip to content

Bug 1824180: Backport adding groundwork for multi-arch images #3457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 7 commits into from
May 21, 2020
Merged

Bug 1824180: Backport adding groundwork for multi-arch images #3457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a208121
*: enable s390x bootimage support
crawford Jan 7, 2020
3e693f7
*: enable ppc64le bootimage support
Prashanth684 Mar 18, 2020
9e50328
Add ppc64le to update-rhcos-bootimage.py
andymcc Apr 15, 2020
33bbb11
Fix TODO in libvirt.go to add ArchitecturePPC64LE
andymcc Apr 15, 2020
207507b
Bump terraform libvirt provider
Prashanth684 Mar 27, 2020
3c649b5
add buildmetadata for s390x
andymcc Apr 28, 2020
c9a136c
add buildmetadata for ppc64le
andymcc Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions data/data/rhcos-ppc64le.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"baseURI": "https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.4-ppc64le/44.81.202004252240-0/ppc64le/",
"buildid": "44.81.202004252240-0",
"images": {
"initramfs": {
"path": "rhcos-44.81.202004252240-0-installer-initramfs.ppc64le.img",
"sha256": "73cc22be85df4ec764f2b6284695fa594dff06af4718d6eb7668b77b560cefd8"
},
"iso": {
"path": "rhcos-44.81.202004252240-0-installer.ppc64le.iso",
"sha256": "9175dea605c2ef49ae250b976478b8685ccbc6035f2b3bd26e925947004bcf2b"
},
"kernel": {
"path": "rhcos-44.81.202004252240-0-installer-kernel-ppc64le",
"sha256": "447777af2b5136b555548ac674f0823148f1faf986df3e54b1119774a80621a5"
},
"metal": {
"path": "rhcos-44.81.202004252240-0-metal.ppc64le.raw.gz",
"sha256": "ad866e9e31209ed2f248e2815e9eaea792d2ddfe1537231ab58f1ca00f57f9e6",
"size": 814734845,
"uncompressed-sha256": "6d6346cd108a35e4de84baa41901c45064bc45dde93a48d4fa79e76d18bcb016",
"uncompressed-size": 3700424704
},
"openstack": {
"path": "rhcos-44.81.202004252240-0-openstack.ppc64le.qcow2.gz",
"sha256": "27a2947aea1039621747a2e4f4ff75a5a614f3977ca94a6f28b06591e01aa047",
"size": 813348296,
"uncompressed-sha256": "b7228af46822f0deeef5bd06e1e78d6188e57bb74ec98f17b3f5bd82e596349f",
"uncompressed-size": 2354970624
},
"ostree": {
"path": "rhcos-44.81.202004252240-0-ostree.ppc64le.tar",
"sha256": "49cefb03446ebd3249f22036f179a67bb6670d80f915826330f667aa7025a36f",
"size": 731453440
},
"qemu": {
"path": "rhcos-44.81.202004252240-0-qemu.ppc64le.qcow2.gz",
"sha256": "06c0d56581358f6d149466ba2c113b5132e5390eb68cfc4c3c9834ad6c69d796",
"size": 813896314,
"uncompressed-sha256": "1f435d7ba80b8339d01552e7138dfcb0001626ced589e96c4e19ce5d2c66a5cf",
"uncompressed-size": 2400976896
}
},
"oscontainer": {
"digest": "sha256:fd1567de4bdca01d95ab8e5eb9b4ab9c9e8259d256f753ba4061c531d6b8f6bc",
"image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
},
"ostree-commit": "21173fcbd7cc29aa270b8037c6c77869c7b2945a45d896e80c0b8db63f3c2b50",
"ostree-version": "44.81.202004252240-0"
}
57 changes: 57 additions & 0 deletions data/data/rhcos-s390x.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"baseURI": "https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.4-s390x/44.81.202004252140-0/s390x/",
"buildid": "44.81.202004252140-0",
"images": {
"dasd": {
"path": "rhcos-44.81.202004252140-0-dasd.s390x.raw.gz",
"sha256": "b84b38fcd4040e02906ffb0d6f2c7d07f02e87cad80c1860b91a308422348364",
"size": 746433534,
"uncompressed-sha256": "00886fa8a5e2decf85763d5e41fe9c08248cc9f4dd6b635b581fee1b254a8432",
"uncompressed-size": 3388997632
},
"initramfs": {
"path": "rhcos-44.81.202004252140-0-installer-initramfs.s390x.img",
"sha256": "2e13f35a3a9e472675b6b915fc1084f8dd82f065813dcb89f05db71e7a12295d"
},
"iso": {
"path": "rhcos-44.81.202004252140-0-installer.s390x.iso",
"sha256": "b57a42438feece1faade14ca5436c35d7e92b1018faa133278be33815d51efe9"
},
"kernel": {
"path": "rhcos-44.81.202004252140-0-installer-kernel-s390x",
"sha256": "1ebb79ccaab68e9b0e18eee44e7fb92300ada7e4937ecc3c37052ae62db94c85"
},
"metal": {
"path": "rhcos-44.81.202004252140-0-metal.s390x.raw.gz",
"sha256": "68a5356ae34235ba950ee64851993e8cf2505edc8212663cf1c7ee92b52f96eb",
"size": 746461543,
"uncompressed-sha256": "4f83deb98fcf4afc1771c7d06ad432fa3fb8ab8f561a50b05e629fd87c628c1d",
"uncompressed-size": 3388997632
},
"openstack": {
"path": "rhcos-44.81.202004252140-0-openstack.s390x.qcow2.gz",
"sha256": "3018b631693dfc5d5ee91ba2d8eeec774ab801556996e39a68ae5bd79fc0657d",
"size": 745137519,
"uncompressed-sha256": "5eb06dfa9ab0d8064fd947afa393f0e0524c7d82a17f7353de4783591ab04fbc",
"uncompressed-size": 2088828928
},
"ostree": {
"path": "rhcos-44.81.202004252140-0-ostree.s390x.tar",
"sha256": "77b3f54fa88da11756994e72f2231452d801748acb452a549fff2c4975fc8e89",
"size": 686766080
},
"qemu": {
"path": "rhcos-44.81.202004252140-0-qemu.s390x.qcow2.gz",
"sha256": "7a51f9858f1a9c7c2812c5c3516ad1aca3054192814b85143378778eab9db095",
"size": 746006738,
"uncompressed-sha256": "cf1f8da465ee970395757b488f1281446101adf2fbd5a3fdec859f706de43596",
"uncompressed-size": 2134376448
}
},
"oscontainer": {
"digest": "sha256:eb003f57224d25f57b3a1d7afe79fbf9d20817e823fca92c2d9457896ee912a4",
"image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
},
"ostree-commit": "0af5951ba6139e849321b4949750a42ff3997eb1da464e65c0cf251b24317ceb",
"ostree-version": "44.81.202004252140-0"
}
16 changes: 9 additions & 7 deletions hack/update-rhcos-bootimage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

parser = argparse.ArgumentParser()
parser.add_argument("meta", action='store')
parser.add_argument("arch", action='store', choices=['amd64'])
parser.add_argument("arch", action='store', choices=['amd64', 's390x', 'ppc64le'])
args = parser.parse_args()

metadata_dir = os.path.join(os.path.dirname(sys.argv[0]), "../data/data")
Expand All @@ -25,13 +25,15 @@
for k in ['images', 'buildid', 'oscontainer',
'ostree-commit', 'ostree-version',
'azure', 'gcp']:
newmeta[k] = meta[k]
newmeta['amis'] = {
entry['name']: {
'hvm': entry['hvm'],
if meta.get(k):
newmeta[k] = meta[k]
if meta.get(k):
newmeta['amis'] = {
entry['name']: {
'hvm': entry['hvm'],
}
for entry in meta['amis']
}
for entry in meta['amis']
}
newmeta['baseURI'] = urllib.parse.urljoin(args.meta, '.')

with open(os.path.join(metadata_dir, f"rhcos-{args.arch}.json"), 'w') as f:
Expand Down
5 changes: 4 additions & 1 deletion pkg/terraform/exec/plugins/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/terraform/exec/plugins/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ ignored = [

[[constraint]]
name = "github.com/dmacvicar/terraform-provider-libvirt"
revision = "40b0cda5333a29dd9f33d1cfdc206bfad3a8af96"
source = "https://github.com/openshift/terraform-provider-libvirt"
branch = "multi_arch"

[[constraint]]
name = "github.com/terraform-providers/terraform-provider-aws"
Expand Down
58 changes: 9 additions & 49 deletions ...ins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/coreos_ignition_def.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 34 additions & 31 deletions ...orm/exec/plugins/vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/domain.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions ...vendor/github.com/dmacvicar/terraform-provider-libvirt/libvirt/resource_libvirt_domain.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions pkg/tfvars/libvirt/libvirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ func TFVars(masterConfig *v1beta1.LibvirtMachineProviderConfig, osImage string,
MasterVcpu: strconv.Itoa(masterConfig.DomainVcpu),
}

// Power PC systems typically require more memory because the page size is 64K and not the default 4K
// TODO: need to make ppc64le a supported architecture - https://bugzilla.redhat.com/show_bug.cgi?id=1821392
if architecture == "ppc64le" {
if architecture == types.ArchitecturePPC64LE {
cfg.BootstrapMemory = 5120
}

Expand Down
Loading