diff --git a/artifacts/centosstream/centos-stream_test.go b/artifacts/centosstream/centos-stream_test.go index 3aee3963..d46faedc 100644 --- a/artifacts/centosstream/centos-stream_test.go +++ b/artifacts/centosstream/centos-stream_test.go @@ -24,60 +24,6 @@ var _ = Describe("CentosStream", func() { Expect(got).To(Equal(details)) Expect(c.Metadata()).To(Equal(metadata)) }, - Entry("centos-stream:8 x86_64", "8", "x86_64", "testdata/centos-stream8-x86_64.checksum", - &api.ArtifactDetails{ - SHA256Sum: "8e22e67687b81e38c7212fc30c47cb24cbc4935c0f2459ed139f498397d1e7cd", - DownloadURL: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2", - AdditionalUniqueTags: []string{"8-20210603.0"}, - ImageArchitecture: "amd64", - }, - &docs.UserData{ - Username: "centos", - }, - map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.stream8", - }, - &api.Metadata{ - Name: "centos-stream", - Version: "8", - Description: description, - ExampleUserData: docs.UserData{ - Username: "centos", - }, - EnvVariables: map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.stream8", - }, - }, - ), - Entry("centos-stream:8 aarch64", "8", "aarch64", "testdata/centos-stream8-aarch64.checksum", - &api.ArtifactDetails{ - SHA256Sum: "5879673f9f7a992e57548dcd99a1f3d0e30c7250a725b8e92f105ac489208ba0", - DownloadURL: "https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-latest.aarch64.qcow2", - AdditionalUniqueTags: []string{"8-latest"}, - ImageArchitecture: "arm64", - }, - &docs.UserData{ - Username: "centos", - }, - map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.stream8", - }, - &api.Metadata{ - Name: "centos-stream", - Version: "8", - Description: description, - ExampleUserData: docs.UserData{ - Username: "centos", - }, - EnvVariables: map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.stream8", - }, - }, - ), Entry("centos-stream:9 x86_64", "9", "x86_64", "testdata/centos-stream9-x86_64.checksum", &api.ArtifactDetails{ SHA256Sum: "bcebdc00511d6e18782732570056cfbc7cba318302748bfc8f66be9c0db68142", diff --git a/artifacts/centosstream/testdata/centos-stream8-aarch64.checksum b/artifacts/centosstream/testdata/centos-stream8-aarch64.checksum deleted file mode 100644 index eddc930c..00000000 --- a/artifacts/centosstream/testdata/centos-stream8-aarch64.checksum +++ /dev/null @@ -1,60 +0,0 @@ -# CentOS-Stream-Container-Base-8-20230501.0.aarch64.tar.xz: 49064048 bytes -SHA256 (CentOS-Stream-Container-Base-8-20230501.0.aarch64.tar.xz) = 9c76d9012df69cc1adeebe5256a61d553e8585f5ec6ce1c2d5803b6a150563c0 -# CentOS-Stream-Container-Base-8-20230822.0.aarch64.tar.xz: 48662816 bytes -SHA256 (CentOS-Stream-Container-Base-8-20230822.0.aarch64.tar.xz) = df8a10af6e1e001325e91095af40eb59359a0cc9ebd37a0b66ee27e5b4eddbb8 -# CentOS-Stream-Container-Base-8-20231030.0.aarch64.tar.xz: 48949996 bytes -SHA256 (CentOS-Stream-Container-Base-8-20231030.0.aarch64.tar.xz) = 2818cca1ce294dfaa38bbed07f7e6063062325b8d2867a010b77d88ce3c5afd3 -# CentOS-Stream-Container-Base-8-20240101.0.aarch64.tar.xz: 48779016 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240101.0.aarch64.tar.xz) = ef6aa459d20dd6b348adcd04b66cf23df9ced02de7a2981d3a5f8c122670ef6f -# CentOS-Stream-Container-Base-8-20240304.0.aarch64.tar.xz: 48902132 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240304.0.aarch64.tar.xz) = 35da6d19916b52c72058192eda2e2c73d6608089cdd9c5a91bc3860ecaa65716 -# CentOS-Stream-Container-Base-8-20240311.0.aarch64.tar.xz: 49338292 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240311.0.aarch64.tar.xz) = 869ef158cbf91e4af54148c864530154f35623daa6a64d30ce6dfb2ca3d33c92 -# CentOS-Stream-Container-Base-8-20240318.0.aarch64.tar.xz: 48944724 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240318.0.aarch64.tar.xz) = 123c809b0d2757938754627d86f5370138e57a499e0bb2c8ef1e5ae59f01649d -# CentOS-Stream-Container-Base-8-20240325.0.aarch64.tar.xz: 48630048 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240325.0.aarch64.tar.xz) = 772ba61e59ed3767d5d336ca0cd41c774eceb508a82e662c8594e46467e8eea8 -# CentOS-Stream-Container-Base-8-20240401.0.aarch64.tar.xz: 48955260 bytes -SHA256 (CentOS-Stream-Container-Base-8-20240401.0.aarch64.tar.xz) = bc3e9534d894e3235b376ca47f009b9a6435452ae59fdecc8fdbb65ebbf70a58 -# CentOS-Stream-Container-Base-8-latest.aarch64.tar.xz: 48955260 bytes -SHA256 (CentOS-Stream-Container-Base-8-latest.aarch64.tar.xz) = bc3e9534d894e3235b376ca47f009b9a6435452ae59fdecc8fdbb65ebbf70a58 -# CentOS-Stream-ec2-8-20230501.0.aarch64.raw.xz: 1241754192 bytes -SHA256 (CentOS-Stream-ec2-8-20230501.0.aarch64.raw.xz) = 0363b0047f41d1c70bf57c6eab19bb23de2e28ed8bc886eac796f274f1e73d21 -# CentOS-Stream-ec2-8-20230822.0.aarch64.raw.xz: 1274440400 bytes -SHA256 (CentOS-Stream-ec2-8-20230822.0.aarch64.raw.xz) = bcbe5be01b65182490d653297235355207dfcbfb3396c113c7335f458022f8cb -# CentOS-Stream-ec2-8-20231030.0.aarch64.raw.xz: 1314321968 bytes -SHA256 (CentOS-Stream-ec2-8-20231030.0.aarch64.raw.xz) = 23b0e6c205ff5cd92ee21c489df5e8e9516cb6864f5e01dce74ce4dda7795bb0 -# CentOS-Stream-ec2-8-20240101.0.aarch64.raw.xz: 1436933692 bytes -SHA256 (CentOS-Stream-ec2-8-20240101.0.aarch64.raw.xz) = 9f17d48ee1bed517ce562b873021df8538e1fc62739941210508accf559122a3 -# CentOS-Stream-ec2-8-20240304.0.aarch64.raw.xz: 1460930640 bytes -SHA256 (CentOS-Stream-ec2-8-20240304.0.aarch64.raw.xz) = 18ed8117dd81463c084cbc67f5be46ce00d806943887863aef38c87c296e7d1a -# CentOS-Stream-ec2-8-20240311.0.aarch64.raw.xz: 1474484160 bytes -SHA256 (CentOS-Stream-ec2-8-20240311.0.aarch64.raw.xz) = 9b59aa395c43953ff740407f1f6a25903725a92452e3b59aa77c93fed97e9f25 -# CentOS-Stream-ec2-8-20240318.0.aarch64.raw.xz: 1442042992 bytes -SHA256 (CentOS-Stream-ec2-8-20240318.0.aarch64.raw.xz) = 2e9a096910dea2773e2643066d6137a4f50d6badee6943f0d0b13996e64fef06 -# CentOS-Stream-ec2-8-20240325.0.aarch64.raw.xz: 1475841816 bytes -SHA256 (CentOS-Stream-ec2-8-20240325.0.aarch64.raw.xz) = a25d3f504830c7287fafe4f787b1f005533c0f5f632c967928effe3a10c84b84 -# CentOS-Stream-ec2-8-20240401.0.aarch64.raw.xz: 1477105020 bytes -SHA256 (CentOS-Stream-ec2-8-20240401.0.aarch64.raw.xz) = dd6b47d49740bf1b275f9866b9b76e1704b8fbfb2366ba228d7b5cb5f3dee5a1 -# CentOS-Stream-ec2-8-latest.aarch64.raw.xz: 1477105020 bytes -SHA256 (CentOS-Stream-ec2-8-latest.aarch64.raw.xz) = dd6b47d49740bf1b275f9866b9b76e1704b8fbfb2366ba228d7b5cb5f3dee5a1 -# CentOS-Stream-GenericCloud-8-20230501.0.aarch64.qcow2: 1614741504 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20230501.0.aarch64.qcow2) = b360b73818f7e9271781547636cbb62a59ff4a45b492c273dd4616789e17c6a0 -# CentOS-Stream-GenericCloud-8-20230822.0.aarch64.qcow2: 1674182656 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20230822.0.aarch64.qcow2) = 0afbeaaa2c764a517838e22ce10f7272b9922cbcc50d7476c5f7b76db5884c2e -# CentOS-Stream-GenericCloud-8-20231030.0.aarch64.qcow2: 1680867328 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20231030.0.aarch64.qcow2) = 255492ed06adacbd93d0deebc181a53c603f7284dafa9e7e90f83289c91f5dee -# CentOS-Stream-GenericCloud-8-20240101.0.aarch64.qcow2: 1823145984 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240101.0.aarch64.qcow2) = 7732d2418869177e739b956c5a44df2ca40433535c6c68df1ecde13415c43c39 -# CentOS-Stream-GenericCloud-8-20240304.0.aarch64.qcow2: 1866859008 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240304.0.aarch64.qcow2) = d4cd325eb1d43a5833c63290fe373a654c34e7b9d91b414ff152593799c6e51e -# CentOS-Stream-GenericCloud-8-20240311.0.aarch64.qcow2: 1871249408 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240311.0.aarch64.qcow2) = a14054a56e6593343fe0062e10ad17b882417782fcd2b8015c74e67f0aff6cde -# CentOS-Stream-GenericCloud-8-20240318.0.aarch64.qcow2: 1840906240 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240318.0.aarch64.qcow2) = 640ecf30b2a655be1abdd4034e636c5794b6838c923171a1b4cd19b1c1fb8d69 -# CentOS-Stream-GenericCloud-8-20240325.0.aarch64.qcow2: 1875902464 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240325.0.aarch64.qcow2) = 21770bea9f94f883f8e21df4a40ef80d0a08b1995dfd40a97a08d5dcc2f4b304 -# CentOS-Stream-GenericCloud-8-20240401.0.aarch64.qcow2: 1872887808 bytes -SHA256 (CentOS-Stream-GenericCloud-8-20240401.0.aarch64.qcow2) = 5879673f9f7a992e57548dcd99a1f3d0e30c7250a725b8e92f105ac489208ba0 -# CentOS-Stream-GenericCloud-8-latest.aarch64.qcow2: 1872887808 bytes -SHA256 (CentOS-Stream-GenericCloud-8-latest.aarch64.qcow2) = 5879673f9f7a992e57548dcd99a1f3d0e30c7250a725b8e92f105ac489208ba0 \ No newline at end of file diff --git a/artifacts/centosstream/testdata/centos-stream8-x86_64.checksum b/artifacts/centosstream/testdata/centos-stream8-x86_64.checksum deleted file mode 100644 index 5eb6aad1..00000000 --- a/artifacts/centosstream/testdata/centos-stream8-x86_64.checksum +++ /dev/null @@ -1,40 +0,0 @@ -# CentOS-Stream-ec2-8-20200113.0.x86_64.qcow2: 713256K -SHA256 (CentOS-Stream-ec2-8-20200113.0.x86_64.qcow2) = 8546f047b1a08f5f9ea4339fc46b1ccd6ced5046f2e4aac3feb1929663a23abe -# CentOS-Stream-GenericCloud-8-20200113.0.x86_64.qcow2: 722624K -SHA256 (CentOS-Stream-GenericCloud-8-20200113.0.x86_64.qcow2) = b80ca9ccad8715aa1aeee582906096d3190b91cebe05fcb3ac7cb197fd68a7fe -# CentOS-Stream-Vagrant-8-20200113.0.x86_64.vagrant-libvirt.box: 476188K -SHA256 (CentOS-Stream-Vagrant-8-20200113.0.x86_64.vagrant-libvirt.box) = b7368505471951391dc7b22363a5bb04da5706e90c0a731b653597707219e151 -# CentOS-Stream-Vagrant-8-20200113.0.x86_64.vagrant-virtualbox.box: 493996K -SHA256 (CentOS-Stream-Vagrant-8-20200113.0.x86_64.vagrant-virtualbox.box) = 168007a2185044c29f3019a8e054de1c0a778fee4046bee654a8ed2d09b26239 -# CentOS-Stream-ec2-8-20201019.1.x86_64.qcow2: 1304612K -SHA256 (CentOS-Stream-ec2-8-20201019.1.x86_64.qcow2) = d927f675f653a7f7a1bd3ea1ca41591d1e7658c875a92c2e9db64c681ddd26a0 -# CentOS-Stream-GenericCloud-8-20201019.1.x86_64.qcow2: 1272164K -SHA256 (CentOS-Stream-GenericCloud-8-20201019.1.x86_64.qcow2) = 68e5d217f8777789cbe5c47cda8776f4acfefa3968b7cef751ba08f651d0cf5a -# CentOS-Stream-Vagrant-8-20201019.1.x86_64.vagrant-libvirt.box: 888580K -SHA256 (CentOS-Stream-Vagrant-8-20201019.1.x86_64.vagrant-libvirt.box) = a333278f15d685b827898150ed8688bbb94954fce42cc732fcfcf0bf4e409619 -# CentOS-Stream-Vagrant-8-20201019.1.x86_64.vagrant-virtualbox.box: 909904K -SHA256 (CentOS-Stream-Vagrant-8-20201019.1.x86_64.vagrant-virtualbox.box) = 96d388ff2170430f032149323ffbba20309b8e0da924e1ad6ec5f024936c2648 -# CentOS-Stream-ec2-8-20201217.0.x86_64.qcow2: 1355388K -SHA256 (CentOS-Stream-ec2-8-20201217.0.x86_64.qcow2) = f0c42947c2c5fd97ac18f02f8d307cfba23246a1ba7eca05d422aa03135b4139 -# CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2: 1311888K -SHA256 (CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2) = 9711ac5c7aa97c7132e9f6da66a9f9ebc278d7f45d8c10cfadf277503e384003 -# CentOS-Stream-Vagrant-8-20201217.0.x86_64.vagrant-libvirt.box: 945084K -SHA256 (CentOS-Stream-Vagrant-8-20201217.0.x86_64.vagrant-libvirt.box) = 58aac9f8fe0712b80a4fb415114e1d5c9777633c9dfa5c0333441cd7da830c0f -# CentOS-Stream-Vagrant-8-20201217.0.x86_64.vagrant-virtualbox.box: 967804K -SHA256 (CentOS-Stream-Vagrant-8-20201217.0.x86_64.vagrant-virtualbox.box) = 9e4d9b9dadad431b1234249e3d68bb24a03ae64dc55146751dc70760db2b5856 -# CentOS-Stream-ec2-8-20210210.0.x86_64.qcow2: 1347728K -SHA256 (CentOS-Stream-ec2-8-20210210.0.x86_64.qcow2) = c7a1212940e177d95cc24599e1a7a04b6195b4d71bf9549dfda7d39035155411 -# CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2: 1323720K -SHA256 (CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2) = c02b29ffc014761895d67a5294f1957b246f8dbcf33b6e26520bba05d7f627ad -# CentOS-Stream-Vagrant-8-20210210.0.x86_64.vagrant-libvirt.box: 924216K -SHA256 (CentOS-Stream-Vagrant-8-20210210.0.x86_64.vagrant-libvirt.box) = 39812e8ac8ba486459ac1af599e4038b20c1638ccae44d9f8a97dae2c9f13bc3 -# CentOS-Stream-Vagrant-8-20210210.0.x86_64.vagrant-virtualbox.box: 946224K -SHA256 (CentOS-Stream-Vagrant-8-20210210.0.x86_64.vagrant-virtualbox.box) = 4ba18cc4bde5f634580b0a6142f328c84d594d75c4775e87f9a4cb26714ad423 -# CentOS-Stream-ec2-8-20210603.0.x86_64.qcow2: 1357236K -SHA256 (CentOS-Stream-ec2-8-20210603.0.x86_64.qcow2) = 18787be94d5a7be03b97c7653d618f7d27f1101dd13e217e7231c4d3dda5ab2c -# CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2: 1323112K -SHA256 (CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2) = 8e22e67687b81e38c7212fc30c47cb24cbc4935c0f2459ed139f498397d1e7cd -# CentOS-Stream-Vagrant-8-20210603.0.x86_64.vagrant-libvirt.box: 925704K -SHA256 (CentOS-Stream-Vagrant-8-20210603.0.x86_64.vagrant-libvirt.box) = faeef8493ffd05644e86a9dbf94df240391e33ae68388aa07d0364b83ecb4db0 -# CentOS-Stream-Vagrant-8-20210603.0.x86_64.vagrant-virtualbox.box: 947556K -SHA256 (CentOS-Stream-Vagrant-8-20210603.0.x86_64.vagrant-virtualbox.box) = 8b6c65957b55bc3d54d8e2b0cefe1e3ec2e01d7f8ae3adecf9162f8629d22857 \ No newline at end of file diff --git a/cmd/medius/common/registry.go b/cmd/medius/common/registry.go index af6fd52e..8261ce44 100644 --- a/cmd/medius/common/registry.go +++ b/cmd/medius/common/registry.go @@ -38,13 +38,6 @@ var staticRegistry = []Entry{ }, UseForDocs: true, }, - { - Artifacts: []api.Artifact{ - centosstream.New("8", "x86_64", &docs.UserData{Username: "centos"}, defaultEnvVariables("u1.medium", "centos.stream8")), - centosstream.New("8", "aarch64", &docs.UserData{Username: "centos"}, nil), - }, - UseForDocs: false, - }, { Artifacts: []api.Artifact{ ubuntu.New("22.04", "x86_64", defaultEnvVariables("u1.medium", "ubuntu")),