Compare commits
No commits in common. 'i9-beta' and 'c9' have entirely different histories.
@ -1 +1 @@
|
|||||||
SOURCES/osbuild-composer-101.tar.gz
|
SOURCES/osbuild-composer-118.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz
|
be808e5f869ae48145daef50ed6ed82b91359b48 SOURCES/osbuild-composer-118.tar.gz
|
||||||
|
|||||||
@ -1,205 +0,0 @@
|
|||||||
From 94b0c0cd9fac3cfd89905bce97fb7b389cb89487 Mon Sep 17 00:00:00 2001
|
|
||||||
From: tigro <tigro@msvsphere-os.ru>
|
|
||||||
Date: Tue, 2 Apr 2024 22:19:23 +0300
|
|
||||||
Subject: [PATCH] Added MSVSphere support
|
|
||||||
|
|
||||||
---
|
|
||||||
repositories/msvsphere-810.json | 16 ++++++++++++++++
|
|
||||||
repositories/msvsphere-89.json | 16 ++++++++++++++++
|
|
||||||
repositories/msvsphere-93.json | 16 ++++++++++++++++
|
|
||||||
repositories/msvsphere-94.json | 16 ++++++++++++++++
|
|
||||||
.../osbuild/images/pkg/distro/rhel8/distro.go | 19 ++++++++++++++++---
|
|
||||||
.../osbuild/images/pkg/distro/rhel9/distro.go | 19 ++++++++++++++++---
|
|
||||||
6 files changed, 96 insertions(+), 6 deletions(-)
|
|
||||||
create mode 100644 repositories/msvsphere-810.json
|
|
||||||
create mode 100644 repositories/msvsphere-89.json
|
|
||||||
create mode 100644 repositories/msvsphere-93.json
|
|
||||||
create mode 100644 repositories/msvsphere-94.json
|
|
||||||
|
|
||||||
diff --git a/repositories/msvsphere-810.json b/repositories/msvsphere-810.json
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2763185
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/repositories/msvsphere-810.json
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+{
|
|
||||||
+ "x86_64": [
|
|
||||||
+ {
|
|
||||||
+ "name": "baseos",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.10/BaseOS/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "name": "appstream",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.10/AppStream/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ }
|
|
||||||
+ ]
|
|
||||||
+}
|
|
||||||
diff --git a/repositories/msvsphere-89.json b/repositories/msvsphere-89.json
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..16ac697
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/repositories/msvsphere-89.json
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+{
|
|
||||||
+ "x86_64": [
|
|
||||||
+ {
|
|
||||||
+ "name": "baseos",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.9/BaseOS/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "name": "appstream",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/8.9/AppStream/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGWBYmMBEADPxCqnOcT9wFITkxY2X5zG+XIOUAHk0TUlevNRpwOsPiRgCX1+\nAbt5eqhiSoFBjqxyDmJ/imwXPhfEkBygBeC91hsY3NQ3+vn4pWmTxXE/j0JYzlHF\n3KA734z9G/oCV1ZwR8hEyUHTyD9+E9rJqVa++eqbql8VtOoC8Ia1+MKyERm3ZYgq\nhAxu/oCUEJpAgNTEM6V34DxKSHRzJsCNafSNL9xJThp/6/GlfeKzHIe+VlfmBuNz\nR7OHBlGtX1cKAxEw/4nb+2WzUnd6kRf7oCPLXzMJd/1eDZSL2v2SsrD6S1Cg/Nl5\ncw3KCdSpC2Nyu3Pi55alkqDyAAEm2MKpcw8XXXspfqTf4jVTBxmsFGir0AQ4VJx7\nLhnJsdje2D+rkiQ7lGcFnbEhudSv1I1H59iIVEp9Flj2GMt1hfwOfdvLhYDSkcFs\nDx3J2j+dqdH0b7ozlRRiLbnM/Ely9SGHHOGky8sWf9NZG4NjppZCkI0no6NLF8g6\nxVZ/yxdT9QQQA7cuGj8IJI1WMNdzG7Mn6twXDlbHBuuCxkqWkq1s7/DSPcyCVAmV\nXcUX89lkuzu/warVbhTSenR1/gNbU4r2VFGT+HoyIBqJrU8V0WhbcZkuZR/PwpJV\nHJSnOxH5DqA2tjXyZueikCIoeJaTI5qt+y14Rw45mjxQCUmzBa22Hk4T9QARAQAB\ntCZNU1ZTcGhlcmUgOCA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCTQQTAQgA\nNxYhBDSxBmiQ6uobOJAkwxRjfysr9IlhBQJlgWJjAhsDBQsJCAcCBRUKCQgCBBYC\nAQMCHgUCF4AACgkQFGN/Kyv0iWHbdQ/+MlvMOkYiJrp4wZE/SgU6XguGj4g2FJ9/\nbelHEA1mfej8LeKk9/DSuTO7Jwn0oL4qw91T3wIJLXxUXkp0lkEUPuA+nyUvvGeH\n2t5Lcvc9gslUOiQfqQ2e1yT3/2ADAyuas2p33Kej7vBwEjKZf+mBbX4PfWTDP/ei\naBE5U5LdwQJ0RNvVqxhRSNHvQksP/pnLalmWbfveFZE+vnyMv7ot+lcYR/EHEIOQ\nQK0PnwXO8D0rYfLhoFB9a9GDHKr6ziVehAVlzM12MM5QlVS+reX4wJRv4UcUi3dh\nYT+r2t6LgiANwPhWZMd4s29uypSpODkxto55Nk9EtxI0YH0wpKHj3nC9R2Cj6SVu\nFZ8Cp5EMfFr7oh+bHhjo7Xp3qc0ZKPvBKSbJ3HJEfueGq0iXFBTcg4vP58dmTThP\n6IkhQdkQwPis+sU9mb7iK4erxgXYKILB8KPUATeSpX3PQ0ohpSZSfIeknSjY31y2\nuGwVjPoad16Z/NqoHqtmqdkbKze4NobAfHssWQ5yXKt6sIfsMWr5x+aeolE4dpWx\n1iXmd9AfF5d0I/B4bToMOegVFow+7ZiZ6ZCYuxyZtdIjeVx/kpWJamqtKkvfIGSw\nEfOLknTKHJisWjyFw8EIg7ITMtLoU2B7reyPoYyauWxGoLrFFmrdD6KVeuUYOxj6\n2ON65s/Q4EM=\n=Co25\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ }
|
|
||||||
+ ]
|
|
||||||
+}
|
|
||||||
diff --git a/repositories/msvsphere-93.json b/repositories/msvsphere-93.json
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..ba608f5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/repositories/msvsphere-93.json
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+{
|
|
||||||
+ "x86_64": [
|
|
||||||
+ {
|
|
||||||
+ "name": "baseos",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/BaseOS/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "name": "appstream",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.3/AppStream/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ }
|
|
||||||
+ ]
|
|
||||||
+}
|
|
||||||
diff --git a/repositories/msvsphere-94.json b/repositories/msvsphere-94.json
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..8edfe5e
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/repositories/msvsphere-94.json
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+{
|
|
||||||
+ "x86_64": [
|
|
||||||
+ {
|
|
||||||
+ "name": "baseos",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.4/BaseOS/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "name": "appstream",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.4/AppStream/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGUulQgBEACk4aP3eOnKfjklE+EFb4+SsTFzDYuyirSAr60g6YNpFqTd/NVw\n8CH5qd6yqam3myiM1EAYTMDozmzfQ/4D75mdKoQN5IItPoqdpkoJOGPRGciHKtgX\n3ZOBAVFhKRcw7lLrlL/XfBl42L7hxpRj0Xk4YAQxFbk6PmcoAz2oDdHBhQd/R9Pi\nvljTYnnrPy3PakBLPlO2GLDA2KRjzHhI2vEKoSv/nBDn4O6c/RL3usOU9H/gnoc7\nMuNJQMh36xf3lDuqgIwi1D6aG6PoClNVopgbvD8IVDOpairW8TvJPMr3BpXMHwSz\n5ixDFtPnVilYgqhi0cg2AampkS2VdbLn9ofGe00DLSfTBEE4370WAPaff7mtjfbf\nmIKm/rqzW5yixSra21ab6nFE7hRiuzlqJkl9oHzt8NZoWhKp8UeoSDNXrVCLxXsg\nAHsX6dSKAppKmUl9VKXxQk6kFObLsrdD8m/If3Xfj4clikDnuqWweeeQfABuDYx4\nhuoTbeOA/8U03ByCYX6A0zvC+CzHwzzO4gQqdbfaSzce6+20rH7psaAT/97lh7Ec\nA8LNdYA1CoPGDcBr+Rr3DP6NomRzBYYVQ2Tihbp4OPb1WN2FKppvjc6j0QK8ZeQP\ne1Xg4ycv4ZFJP4zJpP7TQvpRoFm2mXv8UMg8J17nKeOFMnwL7pEU1DS1fQARAQAB\ntCZNU1ZTcGhlcmUgOSA8cGFja2FnZXJAbXN2c3BoZXJlLW9zLnJ1PokCSwQTAQgA\nNRYhBLQ+/RAbCEoqakRiHJUsZhiL2nOkBQJlLpUIAhsDBAsJCAcEFQoJCAQWAgED\nAh4FAheAAAoJEJUsZhiL2nOkkjoP/1O/ghjcXPqM6qyxwn8sqPawBqHKNB/YgPIK\nWipuxOBQXf/nxtLtne2A+dccuBc6/ghOOIjLSPOYG2LiVg1rlGa2D3465Wv4574e\nJC1Pf/eo4DxJgaotQhzJlTmC1au51ACD3kXpPuCgx88Ys1l6A1AkdraM7OC8qCri\npnKx+Z8/NJgNVUp6eSAh6+KZ/JGA5SqBrYAlYGPgJ1ffjSmb96TUlRdukG13luU2\nZ8JoZORhhovgB2dl02MQCWpe6XRR39h9f4CIgw3w+MQA9r+lK7WLFx5uQCfO3gFq\nIEJ43IhfReiG9tCyY68hsGB0+Evr1KFPs4g1TbMXQFvM3WcanMQbMhrSCCXk+gNh\nQnjYg2/X2lz8JBOTqRulc4YQIxSHiOAT8CMw5oQnhkFwNdUrt+b+W3hUteCX4P5C\no5Cog3EsZTAPQ0+xaZQm2jfwvjnDO1qH0fr/biOpXN4YyvqCBFN0MoWZrpAOp1H3\nubwFmOj59RKniMkzwM8hLIvqqejvY6IEBAVjGAWmRPN9sJGVOWHmK4ZPK6oT7Ggb\nJo64e6kS6XP6JFoL1OUeDYCk+M/ad0UCHMm0mfkQMfPwN+m3eFgJLNqWRtYbuLpX\nd2YMF8ex961XzxWXUPRuE6+ZozNszQ1nE0XQKpo7ovPx3Pp1bRhLxIMZekSfKGJ9\n7TMdj1L4\n=VVm+\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ }
|
|
||||||
+ ]
|
|
||||||
+}
|
|
||||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
||||||
index c20d26a..9831cef 100644
|
|
||||||
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
||||||
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
||||||
@@ -152,6 +152,19 @@ func newDistro(name string, minor int) *distribution {
|
|
||||||
runner: &runner.CentOS{Version: uint64(8)},
|
|
||||||
defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
}
|
|
||||||
+ case "msvsphere":
|
|
||||||
+ rd = distribution{
|
|
||||||
+ name: fmt.Sprintf("msvsphere-8%d", minor),
|
|
||||||
+ product: "MSVSphere",
|
|
||||||
+ osVersion: fmt.Sprintf("8.%d", minor),
|
|
||||||
+ releaseVersion: "8",
|
|
||||||
+ modulePlatformID: "platform:el8",
|
|
||||||
+ vendor: "msvsphere",
|
|
||||||
+ ostreeRefTmpl: "msvsphere/8/%s/edge",
|
|
||||||
+ isolabelTmpl: fmt.Sprintf("MSVSphere-8-%d-%%s-dvd", minor),
|
|
||||||
+ runner: &runner.RHEL{Major: uint64(8), Minor: uint64(minor)},
|
|
||||||
+ defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
+ }
|
|
||||||
default:
|
|
||||||
panic(fmt.Sprintf("unknown distro name: %s", name))
|
|
||||||
}
|
|
||||||
@@ -483,12 +496,12 @@ func ParseID(idStr string) (*distro.ID, error) {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
- if id.Name != "rhel" && id.Name != "centos" {
|
|
||||||
+ if id.Name != "rhel" && id.Name != "centos" && id.Name != "msvsphere" {
|
|
||||||
return nil, fmt.Errorf("invalid distro name: %s", id.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Backward compatibility layer for "rhel-84" or "rhel-810"
|
|
||||||
- if id.Name == "rhel" && id.MinorVersion == -1 {
|
|
||||||
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
|
|
||||||
if id.MajorVersion/10 == 8 {
|
|
||||||
// handle single digit minor version
|
|
||||||
id.MinorVersion = id.MajorVersion % 10
|
|
||||||
@@ -510,7 +523,7 @@ func ParseID(idStr string) (*distro.ID, error) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// RHEL uses minor version
|
|
||||||
- if id.Name == "rhel" && id.MinorVersion == -1 {
|
|
||||||
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
|
|
||||||
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
||||||
index a3b57a9..36ec464 100644
|
|
||||||
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
||||||
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
||||||
@@ -154,6 +154,19 @@ func newDistro(name string, minor int) *distribution {
|
|
||||||
runner: &runner.CentOS{Version: uint64(9)},
|
|
||||||
defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
}
|
|
||||||
+ case "msvsphere":
|
|
||||||
+ rd = distribution{
|
|
||||||
+ name: fmt.Sprintf("msvsphere-9%d", minor),
|
|
||||||
+ product: "MSVSphere",
|
|
||||||
+ osVersion: fmt.Sprintf("9.%d", minor),
|
|
||||||
+ releaseVersion: "9",
|
|
||||||
+ modulePlatformID: "platform:el9",
|
|
||||||
+ vendor: "msvsphere",
|
|
||||||
+ ostreeRefTmpl: "msvsphere/9/%s/edge",
|
|
||||||
+ isolabelTmpl: fmt.Sprintf("MSVSphere-9-%d-%%s-dvd", minor),
|
|
||||||
+ runner: &runner.RHEL{Major: uint64(9), Minor: uint64(minor)},
|
|
||||||
+ defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
+ }
|
|
||||||
default:
|
|
||||||
panic(fmt.Sprintf("unknown distro name: %s", name))
|
|
||||||
}
|
|
||||||
@@ -470,12 +483,12 @@ func ParseID(idStr string) (*distro.ID, error) {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
- if id.Name != "rhel" && id.Name != "centos" {
|
|
||||||
+ if id.Name != "rhel" && id.Name != "centos" && id.Name != "msvsphere" {
|
|
||||||
return nil, fmt.Errorf("invalid distro name: %s", id.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Backward compatibility layer for "rhel-93" or "rhel-910"
|
|
||||||
- if id.Name == "rhel" && id.MinorVersion == -1 {
|
|
||||||
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
|
|
||||||
if id.MajorVersion/10 == 9 {
|
|
||||||
// handle single digit minor version
|
|
||||||
id.MinorVersion = id.MajorVersion % 10
|
|
||||||
@@ -497,7 +510,7 @@ func ParseID(idStr string) (*distro.ID, error) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// RHEL uses minor version
|
|
||||||
- if id.Name == "rhel" && id.MinorVersion == -1 {
|
|
||||||
+ if (id.Name == "rhel" || id.Name == "msvsphere") && id.MinorVersion == -1 {
|
|
||||||
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
From c02c94480dc9e748503e9aa13afe04645405e03d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
|
||||||
Date: Wed, 13 Sep 2023 15:30:43 +0300
|
|
||||||
Subject: [PATCH] Updated MSVSphere support
|
|
||||||
|
|
||||||
---
|
|
||||||
internal/distro/rhel9/distro.go | 17 +++++++++++++++++
|
|
||||||
internal/distroregistry/distroregistry.go | 1 +
|
|
||||||
repositories/msvsphere-92.json | 16 ++++++++++++++++
|
|
||||||
3 files changed, 34 insertions(+)
|
|
||||||
create mode 100644 repositories/msvsphere-92.json
|
|
||||||
|
|
||||||
diff --git a/internal/distro/rhel9/distro.go b/internal/distro/rhel9/distro.go
|
|
||||||
index cdd54d1..a747a45 100644
|
|
||||||
--- a/internal/distro/rhel9/distro.go
|
|
||||||
+++ b/internal/distro/rhel9/distro.go
|
|
||||||
@@ -147,6 +147,10 @@ func NewRHEL92() distro.Distro {
|
|
||||||
return newDistro("rhel", 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
+func NewMSVSphere92() distro.Distro {
|
|
||||||
+ return newDistro("msvsphere", 2)
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
func newDistro(name string, minor int) *distribution {
|
|
||||||
var rd distribution
|
|
||||||
switch name {
|
|
||||||
@@ -176,6 +180,19 @@ func newDistro(name string, minor int) *distribution {
|
|
||||||
runner: &runner.CentOS{Version: uint64(9)},
|
|
||||||
defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
}
|
|
||||||
+ case "msvsphere":
|
|
||||||
+ rd = distribution{
|
|
||||||
+ name: fmt.Sprintf("msvsphere-9%d", minor),
|
|
||||||
+ product: "MSVSphere",
|
|
||||||
+ osVersion: fmt.Sprintf("9.%d", minor),
|
|
||||||
+ releaseVersion: "9",
|
|
||||||
+ modulePlatformID: "platform:el9",
|
|
||||||
+ vendor: "msvsphere",
|
|
||||||
+ ostreeRefTmpl: "msvsphere/9/%s/edge",
|
|
||||||
+ isolabelTmpl: fmt.Sprintf("MSVSphere-9-%d-0-BaseOS-%%s", minor),
|
|
||||||
+ runner: &runner.RHEL{Major: uint64(9), Minor: uint64(minor)},
|
|
||||||
+ defaultImageConfig: defaultDistroImageConfig,
|
|
||||||
+ }
|
|
||||||
default:
|
|
||||||
panic(fmt.Sprintf("unknown distro name: %s", name))
|
|
||||||
}
|
|
||||||
diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go
|
|
||||||
index 9dc32d4..76e0fe4 100644
|
|
||||||
--- a/internal/distroregistry/distroregistry.go
|
|
||||||
+++ b/internal/distroregistry/distroregistry.go
|
|
||||||
@@ -35,6 +35,7 @@ var supportedDistros = []func() distro.Distro{
|
|
||||||
rhel9.NewRHEL91,
|
|
||||||
rhel9.NewRHEL92,
|
|
||||||
rhel9.NewCentOS9,
|
|
||||||
+ rhel9.NewMSVSphere92,
|
|
||||||
}
|
|
||||||
|
|
||||||
type Registry struct {
|
|
||||||
diff --git a/repositories/msvsphere-92.json b/repositories/msvsphere-92.json
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..793350d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/repositories/msvsphere-92.json
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+{
|
|
||||||
+ "x86_64": [
|
|
||||||
+ {
|
|
||||||
+ "name": "baseos",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/BaseOS/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ "name": "appstream",
|
|
||||||
+ "baseurl": "https://repo1.msvsphere-os.ru/msvsphere/9.2/AppStream/x86_64/os/",
|
|
||||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
||||||
+ "check_gpg": true
|
|
||||||
+ }
|
|
||||||
+ ]
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,83 +0,0 @@
|
|||||||
From 30f4b0753691841e232701a3ad17f018e8799ebe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jakub Rusz <jrusz@redhat.com>
|
|
||||||
Date: Mon, 20 Mar 2023 15:29:42 +0100
|
|
||||||
Subject: [PATCH 1/3] tests/ostree: Change centos-8 BOOT_LOCATION to a working
|
|
||||||
boot.iso
|
|
||||||
|
|
||||||
The latest boot.iso stopped working. Changing to an older version to
|
|
||||||
unblock CI. RHBZ#2180024 opened with this issue.
|
|
||||||
---
|
|
||||||
test/cases/ostree-rebase-bios.sh | 4 ++--
|
|
||||||
test/cases/ostree-rebase-uefi.sh | 4 ++--
|
|
||||||
test/cases/ostree.sh | 4 ++--
|
|
||||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
|
|
||||||
index 702b506c8..7390c2a0e 100755
|
|
||||||
--- a/test/cases/ostree-rebase-bios.sh
|
|
||||||
+++ b/test/cases/ostree-rebase-bios.sh
|
|
||||||
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
|
|
||||||
"centos-8")
|
|
||||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
|
||||||
OS_VARIANT="centos8"
|
|
||||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
|
||||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
|
||||||
PARENT_REF="centos/8/${ARCH}/edge"
|
|
||||||
KERNEL_RT_PKG="kernel-rt-core"
|
|
||||||
;;
|
|
||||||
@@ -356,7 +356,7 @@ echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
|
|
||||||
STOPHERE
|
|
||||||
|
|
||||||
# Get the boot.iso from BOOT_LOCATION
|
|
||||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
|
||||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
|
||||||
sudo mv boot.iso /var/lib/libvirt/images
|
|
||||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
|
||||||
|
|
||||||
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
|
|
||||||
index c0697f543..7c3fd7721 100755
|
|
||||||
--- a/test/cases/ostree-rebase-uefi.sh
|
|
||||||
+++ b/test/cases/ostree-rebase-uefi.sh
|
|
||||||
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
|
|
||||||
"centos-8")
|
|
||||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
|
||||||
OS_VARIANT="centos8"
|
|
||||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
|
||||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
|
||||||
PARENT_REF="centos/8/${ARCH}/edge"
|
|
||||||
KERNEL_RT_PKG="kernel-rt-core"
|
|
||||||
;;
|
|
||||||
@@ -358,7 +358,7 @@ LIBVIRT_IMAGE_PATH=/var/lib/libvirt/images/${IMAGE_KEY}-uefi.qcow2
|
|
||||||
sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
|
|
||||||
|
|
||||||
# Get the boot.iso from BOOT_LOCATION
|
|
||||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
|
||||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
|
||||||
sudo mv boot.iso /var/lib/libvirt/images
|
|
||||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
|
||||||
|
|
||||||
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
|
|
||||||
index f2841d953..0cfe6d02a 100755
|
|
||||||
--- a/test/cases/ostree.sh
|
|
||||||
+++ b/test/cases/ostree.sh
|
|
||||||
@@ -104,7 +104,7 @@ case "${ID}-${VERSION_ID}" in
|
|
||||||
OSTREE_REF="centos/8/${ARCH}/edge"
|
|
||||||
OS_VARIANT="centos8"
|
|
||||||
USER_IN_COMMIT="true"
|
|
||||||
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
|
|
||||||
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
|
|
||||||
EMBEDED_CONTAINER="true"
|
|
||||||
FIREWALL_FEATURE="false"
|
|
||||||
DIRS_FILES_CUSTOMIZATION="true"
|
|
||||||
@@ -486,7 +486,7 @@ if [[ "${USER_IN_COMMIT}" == "true" ]]; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get the boot.iso from BOOT_LOCATION
|
|
||||||
-curl -O "$BOOT_LOCATION"/images/boot.iso
|
|
||||||
+curl -O "$BOOT_LOCATION"images/boot.iso
|
|
||||||
sudo mv boot.iso /var/lib/libvirt/images
|
|
||||||
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue