From d773ee557311fda59565bb82e947d7d55001252b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 29 Sep 2021 12:11:47 -0400 Subject: [PATCH] Remove old RHCOS and FCOS metadata (not stream metadata) In https://github.com/openshift/enhancements/pull/679 we landed support for a stream metadata format already used by FCOS and now by RHCOS/OCP consumers to find the bootimages. We kept the old metadata because the UPI CI jobs used it. In https://github.com/openshift/release/pull/17482 I tried to port the UPI CI jobs, but ran into huge levels of technical debt. As best I can tell, the UPI CI jobs are not running on this repo now and are likely broken for other reasons. Let's remove the old data and avoid the confusing duplication. Anyone who goes to work on the UPI CI jobs and sanitizes things should be able to pick up the work to port to stream metadata relatively easily. --- data/data/fcos-amd64.json | 147 ------------------- data/data/rhcos-aarch64.json | 68 --------- data/data/rhcos-amd64.json | 175 ----------------------- data/data/rhcos-ppc64le.json | 68 --------- data/data/rhcos-s390x.json | 68 --------- data/data/rhcos.json | 175 ----------------------- docs/dev/pinned-coreos.md | 11 -- hack/update-rhcos-bootimage.py | 49 ------- images/baremetal/Dockerfile.ci | 1 - images/installer/Dockerfile.upi.ci | 1 - images/installer/Dockerfile.upi.ci.rhel8 | 1 - 11 files changed, 764 deletions(-) delete mode 100644 data/data/fcos-amd64.json delete mode 100644 data/data/rhcos-aarch64.json delete mode 100644 data/data/rhcos-amd64.json delete mode 100644 data/data/rhcos-ppc64le.json delete mode 100644 data/data/rhcos-s390x.json delete mode 100644 data/data/rhcos.json delete mode 100755 hack/update-rhcos-bootimage.py diff --git a/data/data/fcos-amd64.json b/data/data/fcos-amd64.json deleted file mode 100644 index 6e76d83b60b..00000000000 --- a/data/data/fcos-amd64.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "amis": { - "af-south-1": { - "hvm": "ami-0e78e6cb9666e4866" - }, - "ap-east-1": { - "hvm": "ami-09585374e960d19e7" - }, - "ap-northeast-1": { - "hvm": "ami-07d0591c7f35e1c50" - }, - "ap-northeast-2": { - "hvm": "ami-06b9ade598c46aad5" - }, - "ap-northeast-3": { - "hvm": "ami-0e660991a6256edf8" - }, - "ap-south-1": { - "hvm": "ami-0de887f898b8b9edf" - }, - "ap-southeast-1": { - "hvm": "ami-03c5b518d836e0f10" - }, - "ap-southeast-2": { - "hvm": "ami-02126f543e5642165" - }, - "ca-central-1": { - "hvm": "ami-04053e5d27a0fed44" - }, - "eu-central-1": { - "hvm": "ami-0352f1e0f3e503d23" - }, - "eu-north-1": { - "hvm": "ami-0f859448095dc6195" - }, - "eu-south-1": { - "hvm": "ami-07990eb903597defa" - }, - "eu-west-1": { - "hvm": "ami-052aea8dab8614f0b" - }, - "eu-west-2": { - "hvm": "ami-080a4f7c443bbc5a3" - }, - "eu-west-3": { - "hvm": "ami-03190e74e2b49cb29" - }, - "me-south-1": { - "hvm": "ami-0f764a1c27bfceed9" - }, - "sa-east-1": { - "hvm": "ami-0d92d7edb61886f94" - }, - "us-east-1": { - "hvm": "ami-08e8ce95b14176032" - }, - "us-east-2": { - "hvm": "ami-08b1cffdb1cc1e8ea" - }, - "us-west-1": { - "hvm": "ami-0dd2cb185e6859e3b" - }, - "us-west-2": { - "hvm": "ami-076e11761838586ea" - } - }, - "azure": { - "image": "fedora-coreos-34.20210626.3.1-azure.x86_64.vhd", - "url": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/34.20210626.3.1/x86_64/fedora-coreos-34.20210626.3.1-azure.x86_64.vhd.xz" - }, - "baseURI": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/34.20210626.3.1/x86_64/", - "buildid": "34.20210626.3.1", - "gcp": { - "family": "fedora-coreos-stable", - "image": "fedora-coreos-34-20210626-3-1-gcp-x86-64", - "project": "fedora-coreos-cloud", - "url": "https://storage.googleapis.com/fedora-coreos-cloud-image-uploads/image-import/fedora-coreos-34-20210626-3-1-gcp-x86-64.tar.gz" - }, - "images": { - "aws": { - "path": "fedora-coreos-34.20210626.3.1-aws.x86_64.vmdk.xz", - "sha256": "1f5d995f4b2d45eb05d7c3060a52c77cc411412fa2e2d9e0bdeadd98f8ca40b5", - "size": 764419208, - "uncompressed-sha256": "b84880acccfb8e5fb3b7b3343ed7f7b2aaff023960b581fe6229b446b1332664", - "uncompressed-size": 782960128 - }, - "azure": { - "path": "fedora-coreos-34.20210626.3.1-azure.x86_64.vhd.xz", - "sha256": "e89e4e43e16ccc60f6ad52ebcd3430d9d1a50d6f2750d6c19788d0d820e07e6d", - "size": 617702724, - "uncompressed-sha256": "62085a62b381964f88a56df976d8305c03c0d73e37510723587d031792ddcc30", - "uncompressed-size": 10737418752 - }, - "gcp": { - "path": "fedora-coreos-34.20210626.3.1-gcp.x86_64.tar.gz", - "sha256": "425b3ddf913151f118852394f5c33ecd2445294c4f9dac81a5a9f0b34c2cb476", - "size": 764052202, - "uncompressed-sha256": "20fe4983e19ee4dc62e17b8710f60259cf2c9e3f739f76482d1412138c292524", - "uncompressed-size": 1520087040 - }, - "initramfs": { - "path": "fedora-coreos-34.20210626.3.1-live-initramfs.x86_64.img", - "sha256": "6bd515d56bb32d169d241a8b667a18ea87093e704996abc59ae0786912935578" - }, - "iso": { - "path": "fedora-coreos-34.20210626.3.1-live.x86_64.iso", - "sha256": "3ab9eee817051825ff7963de24dcd31a807f620f27cb6eb23ad71c598b60d0d4" - }, - "kernel": { - "path": "fedora-coreos-34.20210626.3.1-live-kernel-x86_64", - "sha256": "e4b5cac76b9f5991a488f2f8d178d82f70cce3457f62986c0136ba19a0463aa5" - }, - "metal": { - "path": "fedora-coreos-34.20210626.3.1-metal.x86_64.raw.xz", - "sha256": "33e57b0df4001d86fd7e186d20e07bf951f6f6a053177ef3c7a31b1484d5bc8b", - "size": 617740724, - "uncompressed-sha256": "9ada6809945fc972757aa8c16ed55c2c2e137c557cb4e7d580dde6f2b3748e5c", - "uncompressed-size": 2515533824 - }, - "openstack": { - "path": "fedora-coreos-34.20210626.3.1-openstack.x86_64.qcow2.xz", - "sha256": "65706172925a57dbd3fd9dc63b846ce41c83aa0ae34159701d2050faba4921ca", - "size": 615544348, - "uncompressed-sha256": "c2364a4ddb747d23263dec398d956799d2362983fb8fc257a5ab1d87b604683d", - "uncompressed-size": 1525415936 - }, - "ostree": { - "path": "fedora-coreos-34.20210626.3.1-ostree.x86_64.tar", - "sha256": "01765707f0282e1fd13da15a16332fa83b2c3b6bcfcd24433b22737cea736cc1", - "size": 695080960 - }, - "qemu": { - "path": "fedora-coreos-34.20210626.3.1-qemu.x86_64.qcow2.xz", - "sha256": "f1e6984e356822f419c217c95a58fb059c8629e3fa1989278d3e7c1a68cf32d2", - "size": 618039340, - "uncompressed-sha256": "acecea6dd7b6d99a554cd381c15390a41affbde46ee16c8eb9a66e7aa7653f7f", - "uncompressed-size": 1526661120 - }, - "vmware": { - "path": "fedora-coreos-34.20210626.3.1-vmware.x86_64.ova", - "sha256": "39847867bd44d26529a9927cb654ecfe110e765dd03ef24320c8d357091e8664", - "size": 782970880 - } - }, - "ostree-commit": "252fffde6f56d183a3c51c05a0c602b61011f6cb4de23a58313ba3b0023dc360", - "ostree-version": "34.20210626.3.1" -} \ No newline at end of file diff --git a/data/data/rhcos-aarch64.json b/data/data/rhcos-aarch64.json deleted file mode 100644 index 2f96246f6f3..00000000000 --- a/data/data/rhcos-aarch64.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "baseURI": "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10-aarch64/410.84.202110141117-0/aarch64/", - "buildid": "410.84.202110141117-0", - "images": { - "aws": { - "path": "rhcos-410.84.202110141117-0-aws.aarch64.vmdk.gz", - "sha256": "74574534349d35a4c68334aee9703dd71c3a4ae9b18baac7a89904dc7ade830a", - "size": 941235210, - "uncompressed-sha256": "eabae4408ad333ab1e706489718bb23f5cab043c8eabf12de8af49e9415416b0", - "uncompressed-size": 962255360 - }, - "live-initramfs": { - "path": "rhcos-410.84.202110141117-0-live-initramfs.aarch64.img", - "sha256": "60b16da7408028a6673f38e86532a2c8791165f5de3847b80a476e3e0151488d" - }, - "live-iso": { - "path": "rhcos-410.84.202110141117-0-live.aarch64.iso", - "sha256": "6509b6be5ffdfcaca647fe7a69bda3019cb07a485f762620d9c57113b84e514a" - }, - "live-kernel": { - "path": "rhcos-410.84.202110141117-0-live-kernel-aarch64", - "sha256": "4097c99a5fea580ca93c165254ff6187c424a183edde5d93b91e46f619ab7a27" - }, - "live-rootfs": { - "path": "rhcos-410.84.202110141117-0-live-rootfs.aarch64.img", - "sha256": "582cd05d0330b391d56971ee135e1aa135a60859b51cdbc3cbb8b0a199640044" - }, - "metal": { - "path": "rhcos-410.84.202110141117-0-metal.aarch64.raw.gz", - "sha256": "43e2b8b950fe2941ce125cc1db1455b8de5a4d360fb3f3fbe3e6a1086450d56f", - "size": 931145378, - "uncompressed-sha256": "78fef3ffea177a2ef8c039c995fc1096654f3d3df36a998b0b8c7c1c353b899b", - "uncompressed-size": 3897556992 - }, - "metal4k": { - "path": "rhcos-410.84.202110141117-0-metal4k.aarch64.raw.gz", - "sha256": "7e0c4281df60bbf231fa3040d5ebcccc363c89d697860cdd087504ebfbc48065", - "size": 931192794, - "uncompressed-sha256": "3534d45fbc48249b455d04fa743f4c02c3186f2e90a0584e3ab24682b0eab526", - "uncompressed-size": 3897556992 - }, - "openstack": { - "path": "rhcos-410.84.202110141117-0-openstack.aarch64.qcow2.gz", - "sha256": "09c31bd2705514241f1e748c94025f93626a975492303dd5c5de4da4d9a14bfc", - "size": 929486722, - "uncompressed-sha256": "34d4fcc383d058ec9ac72cf45e550c8764a937c7cb2aaf69842be4028c96d858", - "uncompressed-size": 2470969344 - }, - "ostree": { - "path": "rhcos-410.84.202110141117-0-ostree.aarch64.ociarchive", - "sha256": "14360bcaf18fc5b306a6c080cdb2128d1e22d3214a62d0473e783314f796e1f6", - "size": 837974016 - }, - "qemu": { - "path": "rhcos-410.84.202110141117-0-qemu.aarch64.qcow2.gz", - "sha256": "5b5f44da77f01761a3f1feab3ba8ac5f1558383b01e11fd44f2e0e81423d5617", - "size": 930541959, - "uncompressed-sha256": "73c2d1c61fb3af7301e121b89ecc8ffbbfdb3f49d227bde8dd9ee5c723e8b61e", - "uncompressed-size": 2507079680 - } - }, - "oscontainer": { - "digest": "sha256:d16b438a1e39d284274d445617816e0ebd09c3d969452a5da0dac1355279bf26", - "image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev" - }, - "ostree-commit": "746dfbad4035e0d7fdd6447ce2a879f67b087ebbf67b44cfd01dc382cd59f30d", - "ostree-version": "410.84.202110141117-0" -} \ No newline at end of file diff --git a/data/data/rhcos-amd64.json b/data/data/rhcos-amd64.json deleted file mode 100644 index 5cb31eaa18e..00000000000 --- a/data/data/rhcos-amd64.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "amis": { - "af-south-1": { - "hvm": "ami-056cae6c62b0bcc7c" - }, - "ap-east-1": { - "hvm": "ami-006cc3f994bdc7efc" - }, - "ap-northeast-1": { - "hvm": "ami-06a11a039fb5161c4" - }, - "ap-northeast-2": { - "hvm": "ami-0743330125f3a1d05" - }, - "ap-northeast-3": { - "hvm": "ami-0a16972ab0cea8a26" - }, - "ap-south-1": { - "hvm": "ami-0dbc86a1897419aaa" - }, - "ap-southeast-1": { - "hvm": "ami-0138fd0c5521997e2" - }, - "ap-southeast-2": { - "hvm": "ami-0b5c890be1c371c60" - }, - "ca-central-1": { - "hvm": "ami-0102260f5c04a074a" - }, - "eu-central-1": { - "hvm": "ami-098b017dbfd897122" - }, - "eu-north-1": { - "hvm": "ami-0755a6c28a9593692" - }, - "eu-south-1": { - "hvm": "ami-0c0582bcb8928ac24" - }, - "eu-west-1": { - "hvm": "ami-08e3757d509bc5b0a" - }, - "eu-west-2": { - "hvm": "ami-0a9e612a64f709b83" - }, - "eu-west-3": { - "hvm": "ami-08a2b82e0bed64324" - }, - "me-south-1": { - "hvm": "ami-05bbab5e2eaee5b2e" - }, - "sa-east-1": { - "hvm": "ami-002331efb242aa1e6" - }, - "us-east-1": { - "hvm": "ami-04251c1ee3c6cbead" - }, - "us-east-2": { - "hvm": "ami-0579c2d2af1a21c18" - }, - "us-west-1": { - "hvm": "ami-0f32e9b1f8ad9c37f" - }, - "us-west-2": { - "hvm": "ami-03c33d8f462c92843" - } - }, - "azure": { - "image": "rhcos-410.84.202110140201-0-azure.x86_64.vhd", - "url": "https://rhcos.blob.core.windows.net/imagebucket/rhcos-410.84.202110140201-0-azure.x86_64.vhd" - }, - "baseURI": "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10/410.84.202110140201-0/x86_64/", - "buildid": "410.84.202110140201-0", - "gcp": { - "image": "rhcos-410-84-202110140201-0-gcp-x86-64", - "project": "rhcos-cloud", - "url": "https://storage.googleapis.com/rhcos/rhcos/rhcos-410-84-202110140201-0-gcp-x86-64.tar.gz" - }, - "images": { - "aws": { - "path": "rhcos-410.84.202110140201-0-aws.x86_64.vmdk.gz", - "sha256": "67040151e4b1d6d2b846ca4d5800d25593585fc0c9470982b3847ad9fa5225b9", - "size": 1032649654, - "uncompressed-sha256": "b6ad04b1e1d707598260e371e20b475f44c7c7d055b7cd4aa512e701e6b534d4", - "uncompressed-size": 1053871616 - }, - "azure": { - "path": "rhcos-410.84.202110140201-0-azure.x86_64.vhd.gz", - "sha256": "2d748409dda400ce775da9a3a22c5c5ff9b343259b8739f0d98eb3f70c568663", - "size": 1032651087, - "uncompressed-sha256": "b395c360cc02640776449cda0e4cd8a90f148e11607dfa1391ad917d5a16c81c", - "uncompressed-size": 17179869696 - }, - "azurestack": { - "path": "rhcos-410.84.202110140201-0-azurestack.x86_64.vhd.gz", - "sha256": "061c26de3163cae9b828a30d8e5a8e0a061e88d96c6d018c8e8687179720f1ea", - "size": 1032649505, - "uncompressed-sha256": "dfe6dd93537ae2de551949fc8909179fabdf12eef3b91c11b0d231240009d6b3", - "uncompressed-size": 17179869696 - }, - "gcp": { - "path": "rhcos-410.84.202110140201-0-gcp.x86_64.tar.gz", - "sha256": "8881192495b97c8b4ab839ea4f17ddbb6e78247c2651fb549fb25f19d83165fd", - "size": 1012929440, - "uncompressed-sha256": "28fbdbc5bf57a00f23f91ddfd01db943697a24740dab3cbd438f1ee045569137", - "uncompressed-size": 2499921920 - }, - "ibmcloud": { - "path": "rhcos-410.84.202110140201-0-ibmcloud.x86_64.qcow2.gz", - "sha256": "856082efe2ece7b7afc860b5df8bcadcf7abd4cff69d5a5d59fa9cbf547c0e97", - "size": 1018477591, - "uncompressed-sha256": "28bc01a23fdc2771dc24ce75bc43d06e9abff7913108bb0cc48108b0bf44641c", - "uncompressed-size": 2550071296 - }, - "live-initramfs": { - "path": "rhcos-410.84.202110140201-0-live-initramfs.x86_64.img", - "sha256": "a34dfd1d3886f579a7e8effe71828add2e16942ca100258cfaba84b1fe5fd9ff" - }, - "live-iso": { - "path": "rhcos-410.84.202110140201-0-live.x86_64.iso", - "sha256": "83d41d18914bc4b31e1f51433a729461a7fe70664f731e7499d258073e36f778" - }, - "live-kernel": { - "path": "rhcos-410.84.202110140201-0-live-kernel-x86_64", - "sha256": "d13269e6c60119397210418781b7057673c4018692d28a868e248a0b550ea247" - }, - "live-rootfs": { - "path": "rhcos-410.84.202110140201-0-live-rootfs.x86_64.img", - "sha256": "d585f48337c289312e5884c642d7e174205ba21f0aad8493078b70b3be862e36" - }, - "metal": { - "path": "rhcos-410.84.202110140201-0-metal.x86_64.raw.gz", - "sha256": "0aa7700cb2a978a6418c6cc060a267b16d594e1dfa8e6c41efc5e5a89f014333", - "size": 1020303556, - "uncompressed-sha256": "2e15cf4a378929a463058d30e651a1478e6859b0b5bc75adcc77dc7d691e67bd", - "uncompressed-size": 3981443072 - }, - "metal4k": { - "path": "rhcos-410.84.202110140201-0-metal4k.x86_64.raw.gz", - "sha256": "37035f1d57756940458b5e246f201f140c888abbe77c72ecf5c75aedbc644dd0", - "size": 1017772886, - "uncompressed-sha256": "ef451b2357f999fb569dacecb464d5c1218e3bad20abd2622d262ae9ec34e509", - "uncompressed-size": 3981443072 - }, - "openstack": { - "path": "rhcos-410.84.202110140201-0-openstack.x86_64.qcow2.gz", - "sha256": "b4627b38c0770933ee0e5495edd6bd4fef5fe0c5c7ee70419d8991636fc5bbae", - "size": 1018477459, - "uncompressed-sha256": "b89f90227a037afb2b8227fd0897bb7a2fb5d22e22f5e8871b4227f2054f3dec", - "uncompressed-size": 2550071296 - }, - "ostree": { - "path": "rhcos-410.84.202110140201-0-ostree.x86_64.ociarchive", - "sha256": "aaf1c94ce5e5e46cd0f9e65ca757003eccd254c691fb1980ee41598b44b77d9f", - "size": 913757696 - }, - "qemu": { - "path": "rhcos-410.84.202110140201-0-qemu.x86_64.qcow2.gz", - "sha256": "4c3658a4c990eb2f3ffad7e1a221f2a467211df56a418c3a2bbda923c093b709", - "size": 1019698076, - "uncompressed-sha256": "65a2aafe7a5a06051285f69adf0dd0f4c83826d3a0d644fa104355047062b16d", - "uncompressed-size": 2586050560 - }, - "vmware": { - "path": "rhcos-410.84.202110140201-0-vmware.x86_64.ova", - "sha256": "950e76e67a2bb458843ba86bccca5860486016188b5ca161c5323635169688d7", - "size": 1053880320 - } - }, - "oscontainer": { - "digest": "sha256:4abee5a8633a29d88af392fa6a509845ba4f71688e7074efb148d4372738046f", - "image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev" - }, - "ostree-commit": "55dd91c248286fcec0a8a7969b4fe45ca7df613d4a4a0edea325fffd7b1fe5e3", - "ostree-version": "410.84.202110140201-0" -} \ No newline at end of file diff --git a/data/data/rhcos-ppc64le.json b/data/data/rhcos-ppc64le.json deleted file mode 100644 index 1acec71498a..00000000000 --- a/data/data/rhcos-ppc64le.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "baseURI": "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10-ppc64le/410.84.202110141003-0/ppc64le/", - "buildid": "410.84.202110141003-0", - "images": { - "live-initramfs": { - "path": "rhcos-410.84.202110141003-0-live-initramfs.ppc64le.img", - "sha256": "b400c6e4460384fcb6d8b1c22af37e748002ea901111a0c2c95a1553f0c1a59b" - }, - "live-iso": { - "path": "rhcos-410.84.202110141003-0-live.ppc64le.iso", - "sha256": "042c76b4deef740b0121615b785e268943a32ca4a3fa6bbd3ecfd2e192a54c0e" - }, - "live-kernel": { - "path": "rhcos-410.84.202110141003-0-live-kernel-ppc64le", - "sha256": "d2f8f29ef59b87de2cbd7df8be60c06620bc90e88f4a722bb8278333d76ca3f8" - }, - "live-rootfs": { - "path": "rhcos-410.84.202110141003-0-live-rootfs.ppc64le.img", - "sha256": "a30ac171e4afea05934943f7f6a9ea3089fbfc3e48ccd26fd051d1626adaa0bc" - }, - "metal": { - "path": "rhcos-410.84.202110141003-0-metal.ppc64le.raw.gz", - "sha256": "29635abc26733df1c4062e3b8e40b4ac7fe145fadca52aa4942a3da69c08c025", - "size": 988920762, - "uncompressed-sha256": "f0e4e91113f3a3f49e9a50102719349380539117c4b77b40e17262a72ee9a11c", - "uncompressed-size": 4145020928 - }, - "metal4k": { - "path": "rhcos-410.84.202110141003-0-metal4k.ppc64le.raw.gz", - "sha256": "f9cb41f107454afeb3f1ff5b033f5199b851cbf8da46bcb9c2c352915f48dde6", - "size": 989080701, - "uncompressed-sha256": "9548d02f75f2c113e5748ef6a36cd22a71db8b18980d7245b86b8d971ef1a9ff", - "uncompressed-size": 4145020928 - }, - "openstack": { - "path": "rhcos-410.84.202110141003-0-openstack.ppc64le.qcow2.gz", - "sha256": "72fe3f6493bf28c9ddf93a411e7a6abc41efe62cccf9c5ada9d2045a2a6965a1", - "size": 987058966, - "uncompressed-sha256": "71c8617bd859cb76cb3156f15c9f5eadf4137d45c8875ff1e4f121bcad2ffca9", - "uncompressed-size": 2678128640 - }, - "ostree": { - "path": "rhcos-410.84.202110141003-0-ostree.ppc64le.ociarchive", - "sha256": "ea529c1015b7007932f1817f760661051cc5140ed309d7d6544d8f206f735529", - "size": 884873728 - }, - "powervs": { - "path": "rhcos-410.84.202110141003-0-powervs.ppc64le.ova.gz", - "sha256": "4183be3411d1cd18342aa419ba580641db62350c81606e0ce15f775ccddf0104", - "size": 984252473, - "uncompressed-sha256": "6bce093bb2bf2ca47a3dc2842fdfe52d602d1f6ba1cdde265a79b2417864acda", - "uncompressed-size": 2539479040 - }, - "qemu": { - "path": "rhcos-410.84.202110141003-0-qemu.ppc64le.qcow2.gz", - "sha256": "0e9ef571b9db6ab323acba214dd187483b7ceb79e90d0a8b9e3d848e37b59c99", - "size": 987990578, - "uncompressed-sha256": "addfbbc135ba0c5bd652761ac1f526a029b68d41ef0c2176a12dba13a4969f14", - "uncompressed-size": 2715484160 - } - }, - "oscontainer": { - "digest": "sha256:a66024be0bab105d01f827b73e0845f02343a4a26e39335b7c18fd1ec8668a40", - "image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev" - }, - "ostree-commit": "be8c62bde741a4f7cac0bdce002348a685ffa1480f3fd8ca0145f6185f7ec6ac", - "ostree-version": "410.84.202110141003-0" -} \ No newline at end of file diff --git a/data/data/rhcos-s390x.json b/data/data/rhcos-s390x.json deleted file mode 100644 index 2593ee9f455..00000000000 --- a/data/data/rhcos-s390x.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "baseURI": "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10-s390x/410.84.202110141003-0/s390x/", - "buildid": "410.84.202110141003-0", - "images": { - "dasd": { - "path": "rhcos-410.84.202110141003-0-dasd.s390x.raw.gz", - "sha256": "ba75afc3ed8dd629093d5878f16ceef310464592b433555b140ab15f9132726a", - "size": 900672000, - "uncompressed-sha256": "0fac7492263c6f4fc6b2cf788b2aa63ee41d25cbb24ccbf3f86f80da731846ca", - "uncompressed-size": 3733979136 - }, - "live-initramfs": { - "path": "rhcos-410.84.202110141003-0-live-initramfs.s390x.img", - "sha256": "7ab0390315c0bb441ccdd03ae1cdb3aeca0574a8fb9456a419609e4da6d77f82" - }, - "live-iso": { - "path": "rhcos-410.84.202110141003-0-live.s390x.iso", - "sha256": "b7e48c15c93ae32d25e246fcb74b825be6c96ede127a7d5d869c71365901e17d" - }, - "live-kernel": { - "path": "rhcos-410.84.202110141003-0-live-kernel-s390x", - "sha256": "81d8f6040cf3913ed01379e6af950d0c8168a4f6e0adeecaf63ae527c759ade9" - }, - "live-rootfs": { - "path": "rhcos-410.84.202110141003-0-live-rootfs.s390x.img", - "sha256": "3c8d2e02ebc24917d2b210b1a8da394dc2bc3213de6dcbae79d9303f0951ca78" - }, - "metal": { - "path": "rhcos-410.84.202110141003-0-metal.s390x.raw.gz", - "sha256": "29e3a3fa9a87d4aed23a919faa88a9ca7964f9b74c7a69af4e34f751c905f1f2", - "size": 900699210, - "uncompressed-sha256": "e13de205885c0c05299ea7e076500853772898288f89a7f9df9280360678ab91", - "uncompressed-size": 3733979136 - }, - "metal4k": { - "path": "rhcos-410.84.202110141003-0-metal4k.s390x.raw.gz", - "sha256": "2a8b874aa9e4c58011188d48cb398796565018fe739270d7b28981ddc83a6fae", - "size": 900716266, - "uncompressed-sha256": "189863421d96d4e9cabd88c60141c19c2941634c99961d310a09fe5e70fc111d", - "uncompressed-size": 3733979136 - }, - "openstack": { - "path": "rhcos-410.84.202110141003-0-openstack.s390x.qcow2.gz", - "sha256": "5df6419e695d0e1be7812edcbeb64705c6a4a3dd5c233a9d95a2aac4ec726c9a", - "size": 898925481, - "uncompressed-sha256": "76bfac0418541213a3b83e042cbbd9789869d2549c32e450991f777522017e3b", - "uncompressed-size": 2334785536 - }, - "ostree": { - "path": "rhcos-410.84.202110141003-0-ostree.s390x.ociarchive", - "sha256": "598e1f1b3fd818ffdc83673feafd539955e3fccb089bb7f38d2321e2b062baf1", - "size": 820400128 - }, - "qemu": { - "path": "rhcos-410.84.202110141003-0-qemu.s390x.qcow2.gz", - "sha256": "d91e629802a71aee69679b8476f1078da9937d294ce221cc061a962d1658f572", - "size": 899971481, - "uncompressed-sha256": "74547ec8fa2d3dd8f3c05ab08cde529ae701dd3bb5688a890eafb745ead8bf89", - "uncompressed-size": 2370961408 - } - }, - "oscontainer": { - "digest": "sha256:a7ddf5f62ec371fe898175ae503dcfd0b930910f600944d58fb8f1569ae62155", - "image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev" - }, - "ostree-commit": "bd18656b634c354a1360e7c7c969a4a84bca0da1e5a308fd760e55cc6a9d69a8", - "ostree-version": "410.84.202110141003-0" -} \ No newline at end of file diff --git a/data/data/rhcos.json b/data/data/rhcos.json deleted file mode 100644 index 5cb31eaa18e..00000000000 --- a/data/data/rhcos.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "amis": { - "af-south-1": { - "hvm": "ami-056cae6c62b0bcc7c" - }, - "ap-east-1": { - "hvm": "ami-006cc3f994bdc7efc" - }, - "ap-northeast-1": { - "hvm": "ami-06a11a039fb5161c4" - }, - "ap-northeast-2": { - "hvm": "ami-0743330125f3a1d05" - }, - "ap-northeast-3": { - "hvm": "ami-0a16972ab0cea8a26" - }, - "ap-south-1": { - "hvm": "ami-0dbc86a1897419aaa" - }, - "ap-southeast-1": { - "hvm": "ami-0138fd0c5521997e2" - }, - "ap-southeast-2": { - "hvm": "ami-0b5c890be1c371c60" - }, - "ca-central-1": { - "hvm": "ami-0102260f5c04a074a" - }, - "eu-central-1": { - "hvm": "ami-098b017dbfd897122" - }, - "eu-north-1": { - "hvm": "ami-0755a6c28a9593692" - }, - "eu-south-1": { - "hvm": "ami-0c0582bcb8928ac24" - }, - "eu-west-1": { - "hvm": "ami-08e3757d509bc5b0a" - }, - "eu-west-2": { - "hvm": "ami-0a9e612a64f709b83" - }, - "eu-west-3": { - "hvm": "ami-08a2b82e0bed64324" - }, - "me-south-1": { - "hvm": "ami-05bbab5e2eaee5b2e" - }, - "sa-east-1": { - "hvm": "ami-002331efb242aa1e6" - }, - "us-east-1": { - "hvm": "ami-04251c1ee3c6cbead" - }, - "us-east-2": { - "hvm": "ami-0579c2d2af1a21c18" - }, - "us-west-1": { - "hvm": "ami-0f32e9b1f8ad9c37f" - }, - "us-west-2": { - "hvm": "ami-03c33d8f462c92843" - } - }, - "azure": { - "image": "rhcos-410.84.202110140201-0-azure.x86_64.vhd", - "url": "https://rhcos.blob.core.windows.net/imagebucket/rhcos-410.84.202110140201-0-azure.x86_64.vhd" - }, - "baseURI": "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10/410.84.202110140201-0/x86_64/", - "buildid": "410.84.202110140201-0", - "gcp": { - "image": "rhcos-410-84-202110140201-0-gcp-x86-64", - "project": "rhcos-cloud", - "url": "https://storage.googleapis.com/rhcos/rhcos/rhcos-410-84-202110140201-0-gcp-x86-64.tar.gz" - }, - "images": { - "aws": { - "path": "rhcos-410.84.202110140201-0-aws.x86_64.vmdk.gz", - "sha256": "67040151e4b1d6d2b846ca4d5800d25593585fc0c9470982b3847ad9fa5225b9", - "size": 1032649654, - "uncompressed-sha256": "b6ad04b1e1d707598260e371e20b475f44c7c7d055b7cd4aa512e701e6b534d4", - "uncompressed-size": 1053871616 - }, - "azure": { - "path": "rhcos-410.84.202110140201-0-azure.x86_64.vhd.gz", - "sha256": "2d748409dda400ce775da9a3a22c5c5ff9b343259b8739f0d98eb3f70c568663", - "size": 1032651087, - "uncompressed-sha256": "b395c360cc02640776449cda0e4cd8a90f148e11607dfa1391ad917d5a16c81c", - "uncompressed-size": 17179869696 - }, - "azurestack": { - "path": "rhcos-410.84.202110140201-0-azurestack.x86_64.vhd.gz", - "sha256": "061c26de3163cae9b828a30d8e5a8e0a061e88d96c6d018c8e8687179720f1ea", - "size": 1032649505, - "uncompressed-sha256": "dfe6dd93537ae2de551949fc8909179fabdf12eef3b91c11b0d231240009d6b3", - "uncompressed-size": 17179869696 - }, - "gcp": { - "path": "rhcos-410.84.202110140201-0-gcp.x86_64.tar.gz", - "sha256": "8881192495b97c8b4ab839ea4f17ddbb6e78247c2651fb549fb25f19d83165fd", - "size": 1012929440, - "uncompressed-sha256": "28fbdbc5bf57a00f23f91ddfd01db943697a24740dab3cbd438f1ee045569137", - "uncompressed-size": 2499921920 - }, - "ibmcloud": { - "path": "rhcos-410.84.202110140201-0-ibmcloud.x86_64.qcow2.gz", - "sha256": "856082efe2ece7b7afc860b5df8bcadcf7abd4cff69d5a5d59fa9cbf547c0e97", - "size": 1018477591, - "uncompressed-sha256": "28bc01a23fdc2771dc24ce75bc43d06e9abff7913108bb0cc48108b0bf44641c", - "uncompressed-size": 2550071296 - }, - "live-initramfs": { - "path": "rhcos-410.84.202110140201-0-live-initramfs.x86_64.img", - "sha256": "a34dfd1d3886f579a7e8effe71828add2e16942ca100258cfaba84b1fe5fd9ff" - }, - "live-iso": { - "path": "rhcos-410.84.202110140201-0-live.x86_64.iso", - "sha256": "83d41d18914bc4b31e1f51433a729461a7fe70664f731e7499d258073e36f778" - }, - "live-kernel": { - "path": "rhcos-410.84.202110140201-0-live-kernel-x86_64", - "sha256": "d13269e6c60119397210418781b7057673c4018692d28a868e248a0b550ea247" - }, - "live-rootfs": { - "path": "rhcos-410.84.202110140201-0-live-rootfs.x86_64.img", - "sha256": "d585f48337c289312e5884c642d7e174205ba21f0aad8493078b70b3be862e36" - }, - "metal": { - "path": "rhcos-410.84.202110140201-0-metal.x86_64.raw.gz", - "sha256": "0aa7700cb2a978a6418c6cc060a267b16d594e1dfa8e6c41efc5e5a89f014333", - "size": 1020303556, - "uncompressed-sha256": "2e15cf4a378929a463058d30e651a1478e6859b0b5bc75adcc77dc7d691e67bd", - "uncompressed-size": 3981443072 - }, - "metal4k": { - "path": "rhcos-410.84.202110140201-0-metal4k.x86_64.raw.gz", - "sha256": "37035f1d57756940458b5e246f201f140c888abbe77c72ecf5c75aedbc644dd0", - "size": 1017772886, - "uncompressed-sha256": "ef451b2357f999fb569dacecb464d5c1218e3bad20abd2622d262ae9ec34e509", - "uncompressed-size": 3981443072 - }, - "openstack": { - "path": "rhcos-410.84.202110140201-0-openstack.x86_64.qcow2.gz", - "sha256": "b4627b38c0770933ee0e5495edd6bd4fef5fe0c5c7ee70419d8991636fc5bbae", - "size": 1018477459, - "uncompressed-sha256": "b89f90227a037afb2b8227fd0897bb7a2fb5d22e22f5e8871b4227f2054f3dec", - "uncompressed-size": 2550071296 - }, - "ostree": { - "path": "rhcos-410.84.202110140201-0-ostree.x86_64.ociarchive", - "sha256": "aaf1c94ce5e5e46cd0f9e65ca757003eccd254c691fb1980ee41598b44b77d9f", - "size": 913757696 - }, - "qemu": { - "path": "rhcos-410.84.202110140201-0-qemu.x86_64.qcow2.gz", - "sha256": "4c3658a4c990eb2f3ffad7e1a221f2a467211df56a418c3a2bbda923c093b709", - "size": 1019698076, - "uncompressed-sha256": "65a2aafe7a5a06051285f69adf0dd0f4c83826d3a0d644fa104355047062b16d", - "uncompressed-size": 2586050560 - }, - "vmware": { - "path": "rhcos-410.84.202110140201-0-vmware.x86_64.ova", - "sha256": "950e76e67a2bb458843ba86bccca5860486016188b5ca161c5323635169688d7", - "size": 1053880320 - } - }, - "oscontainer": { - "digest": "sha256:4abee5a8633a29d88af392fa6a509845ba4f71688e7074efb148d4372738046f", - "image": "quay.io/openshift-release-dev/ocp-v4.0-art-dev" - }, - "ostree-commit": "55dd91c248286fcec0a8a7969b4fe45ca7df613d4a4a0edea325fffd7b1fe5e3", - "ostree-version": "410.84.202110140201-0" -} \ No newline at end of file diff --git a/docs/dev/pinned-coreos.md b/docs/dev/pinned-coreos.md index 104cc559303..f006793ef4f 100644 --- a/docs/dev/pinned-coreos.md +++ b/docs/dev/pinned-coreos.md @@ -31,17 +31,6 @@ For more information on this command, see: - https://github.com/coreos/coreos-assembler/pull/2000 - https://github.com/coreos/coreos-assembler/pull/2052 - -### Updating pinned legacy metadata - -To update the legacy metadata, use: - -``` -./hack/update-rhcos-bootimage.py https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.6/46.82.202008260918-0/x86_64/meta.json amd64 -``` - -This will hopefully be removed soon. - ### Origin of stream metadata diff --git a/hack/update-rhcos-bootimage.py b/hack/update-rhcos-bootimage.py deleted file mode 100755 index 5871d112af3..00000000000 --- a/hack/update-rhcos-bootimage.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python3 -# This script updates the legacy metadata. We hope to remove it soon. -# See docs/dev/pinned-coreos.md for more information. -import codecs,os,sys,json,argparse -import urllib.parse -import urllib.request - -# An app running in the CI cluster exposes this public endpoint about ART RHCOS -# builds. Do not try to e.g. point to RHT-internal endpoints. -RHCOS_RELEASES_APP = 'https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com' - -parser = argparse.ArgumentParser() -parser.add_argument("meta", action='store') -parser.add_argument("arch", action='store', choices=['amd64', 's390x', 'ppc64le', 'aarch64']) -args = parser.parse_args() - -metadata_dir = os.path.join(os.path.dirname(sys.argv[0]), "../data/data") - -if not args.meta.startswith(RHCOS_RELEASES_APP): - raise SystemExit("URL must start with: " + RHCOS_RELEASES_APP) - -with urllib.request.urlopen(args.meta) as f: - string_f = codecs.getreader('utf-8')(f) # support for Python < 3.6 - meta = json.load(string_f) -newmeta = {} -for k in ['images', 'buildid', 'oscontainer', - 'ostree-commit', 'ostree-version', - 'azure', 'gcp']: - if meta.get(k): - newmeta[k] = meta[k] -if meta.get(k): - newmeta['amis'] = { - entry['name']: { - 'hvm': entry['hvm'], - } - for entry in meta['amis'] - } -newmeta['baseURI'] = urllib.parse.urljoin(args.meta, '.') - -with open(os.path.join(metadata_dir, 'rhcos-{}.json'.format(args.arch)), 'w') as f: - json.dump(newmeta, f, sort_keys=True, indent=4) - -# Continue to populate the legacy metadata file because there are still -# processes consuming this file directly. This normally could just be a symlink -# but some of these processes reference raw.githubusercontent.com which doesn't -# follow symlinks. -if args.arch == 'amd64': - with open(os.path.join(metadata_dir, "rhcos.json"), 'w') as f: - json.dump(newmeta, f, sort_keys=True, indent=4) diff --git a/images/baremetal/Dockerfile.ci b/images/baremetal/Dockerfile.ci index 614ec1b22f9..f8f735f8e0c 100644 --- a/images/baremetal/Dockerfile.ci +++ b/images/baremetal/Dockerfile.ci @@ -12,7 +12,6 @@ RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh FROM registry.ci.openshift.org/ocp/4.10:base COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install -COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json /var/cache/ RUN dnf upgrade -y && \ dnf install --setopt=tsflags=nodocs -y \ diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index dd23fc333a8..3f36f789d1f 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -15,7 +15,6 @@ FROM registry.ci.openshift.org/ocp/4.8:base COPY --from=cli /usr/bin/oc /bin/oc COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi -COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json /var/lib/openshift-install/rhcos.json RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc RUN sh -c 'echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" >/etc/yum.repos.d/azure-cli.repo' diff --git a/images/installer/Dockerfile.upi.ci.rhel8 b/images/installer/Dockerfile.upi.ci.rhel8 index 0ecf5989d98..34ab217ac93 100644 --- a/images/installer/Dockerfile.upi.ci.rhel8 +++ b/images/installer/Dockerfile.upi.ci.rhel8 @@ -15,7 +15,6 @@ FROM registry.ci.openshift.org/ocp/4.8:base COPY --from=cli /usr/bin/oc /bin/oc COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi -COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json /var/lib/openshift-install/rhcos.json RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ sh -c 'echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" >/etc/yum.repos.d/azure-cli.repo' && \