Change-Id: I61e509ab9ff42693ce6c062b8a71ecdf0f51735e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3711
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
| ... | ... |
@@ -35,6 +35,8 @@ class OstreeServerInstaller(Installer): |
| 35 | 35 |
|
| 36 | 36 |
self.run("mkdir -p {}/srv/rpm-ostree/repo".format(self.photon_root))
|
| 37 | 37 |
self.run("cp ./photon-base.json {}/srv/rpm-ostree/".format(self.photon_root))
|
| 38 |
+ self.run("cp ./photon-minimal.json {}/srv/rpm-ostree/".format(self.photon_root))
|
|
| 39 |
+ self.run("cp ./photon-full.json {}/srv/rpm-ostree/".format(self.photon_root))
|
|
| 38 | 40 |
self.run("ln -s /etc/yum.repos.d/photon.repo {}/srv/rpm-ostree/photon-ostree.repo".format(self.photon_root))
|
| 39 | 41 |
self.run("ln -s /etc/yum.repos.d/photon-iso.repo {}/srv/rpm-ostree/photon-iso-ostree.repo".format(self.photon_root))
|
| 40 | 42 |
self.run("ln -s /etc/yum.repos.d/photon-updates.repo {}/srv/rpm-ostree/photon-updates-ostree.repo".format(self.photon_root))
|
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
{
|
| 2 |
- "comment": "Photon Minimal OSTree", |
|
| 2 |
+ "comment": "Photon Base OSTree", |
|
| 3 | 3 |
|
| 4 | 4 |
"osname": "photon", |
| 5 | 5 |
|
| 6 |
- "ref": "photon/2.0/x86_64/minimal", |
|
| 6 |
+ "ref": "photon/2.0/x86_64/base", |
|
| 7 | 7 |
|
| 8 |
- "automatic_version_prefix": "2.0_minimal", |
|
| 8 |
+ "automatic_version_prefix": "2.0_base", |
|
| 9 | 9 |
|
| 10 | 10 |
"repos": ["photon", "photon-updates"], |
| 11 | 11 |
|
| ... | ... |
@@ -18,8 +18,7 @@ |
| 18 | 18 |
"documentation": false, |
| 19 | 19 |
|
| 20 | 20 |
"packages": [ |
| 21 |
- "attr", |
|
| 22 |
- "bash", "bc", "binutils", "bridge-utils", "bzip2", |
|
| 21 |
+ "bash", "bc", "bridge-utils", "bzip2", |
|
| 23 | 22 |
"ca-certificates", "coreutils", "cpio", "cracklib", "cracklib-dicts", "curl", |
| 24 | 23 |
"dbus", "docker", "dracut", "dracut-tools", |
| 25 | 24 |
"expat", |
| ... | ... |
@@ -27,8 +26,7 @@ |
| 27 | 27 |
"glibc", "gmp", "grep", "grub2", "gzip", |
| 28 | 28 |
"iana-etc", "iproute2", "iptables", |
| 29 | 29 |
"kmod", |
| 30 |
- "libcap", "libgcc", "libgomp", "libstdc++", "libtool", "linux", |
|
| 31 |
- "mpfr", |
|
| 30 |
+ "libcap", "libgcc", "libstdc++", "libtool", "linux", |
|
| 32 | 31 |
"ncurses", "net-tools", "nss-altfiles", |
| 33 | 32 |
"openssh", "openssl", |
| 34 | 33 |
"photon-release", "pkg-config", "procps-ng", |
| ... | ... |
@@ -39,8 +37,5 @@ |
| 39 | 39 |
"which", |
| 40 | 40 |
"xz", |
| 41 | 41 |
"zlib" |
| 42 |
- ] |
|
| 43 |
- |
|
| 44 |
- |
|
| 42 |
+ ] |
|
| 45 | 43 |
} |
| 46 |
- |
| 47 | 44 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,359 @@ |
| 0 |
+{
|
|
| 1 |
+ "comment": "Photon Full OSTree", |
|
| 2 |
+ |
|
| 3 |
+ "osname": "photon", |
|
| 4 |
+ |
|
| 5 |
+ "ref": "photon/2.0/x86_64/full", |
|
| 6 |
+ |
|
| 7 |
+ "automatic_version_prefix": "2.0_full", |
|
| 8 |
+ |
|
| 9 |
+ "repos": ["photon", "photon-updates"], |
|
| 10 |
+ |
|
| 11 |
+ "selinux": false, |
|
| 12 |
+ |
|
| 13 |
+ "initramfs-args": ["--no-hostonly"], |
|
| 14 |
+ |
|
| 15 |
+ "bootstrap_packages": ["filesystem"], |
|
| 16 |
+ |
|
| 17 |
+ "documentation": true, |
|
| 18 |
+ |
|
| 19 |
+ "packages": [ |
|
| 20 |
+ "Linux-PAM", |
|
| 21 |
+ "Linux-PAM-lang", |
|
| 22 |
+ "XML-Parser", |
|
| 23 |
+ "acl", |
|
| 24 |
+ "apache-maven", |
|
| 25 |
+ "apr", |
|
| 26 |
+ "apr-util", |
|
| 27 |
+ "apr-util-ldap", |
|
| 28 |
+ "apr-util-pgsql", |
|
| 29 |
+ "apr-util-sqlite", |
|
| 30 |
+ "atftp", |
|
| 31 |
+ "atftp-client", |
|
| 32 |
+ "attr", |
|
| 33 |
+ "audit", |
|
| 34 |
+ "autoconf", |
|
| 35 |
+ "autogen-libopts", |
|
| 36 |
+ "automake", |
|
| 37 |
+ "bash", |
|
| 38 |
+ "bash-lang", |
|
| 39 |
+ "bc", |
|
| 40 |
+ "binutils", |
|
| 41 |
+ "bison", |
|
| 42 |
+ "boost", |
|
| 43 |
+ "bridge-utils", |
|
| 44 |
+ "btrfs-progs", |
|
| 45 |
+ "bubblewrap", |
|
| 46 |
+ "build-essential", |
|
| 47 |
+ "bzip2", |
|
| 48 |
+ "bzip2-libs", |
|
| 49 |
+ "c-ares", |
|
| 50 |
+ "ca-certificates", |
|
| 51 |
+ "ca-certificates-pki", |
|
| 52 |
+ "cdrkit", |
|
| 53 |
+ "check", |
|
| 54 |
+ "chkconfig", |
|
| 55 |
+ "cifs-utils", |
|
| 56 |
+ "cloud-init", |
|
| 57 |
+ "cmake", |
|
| 58 |
+ "cni", |
|
| 59 |
+ "coreutils", |
|
| 60 |
+ "coreutils-lang", |
|
| 61 |
+ "cpio", |
|
| 62 |
+ "cracklib", |
|
| 63 |
+ "cracklib-dicts", |
|
| 64 |
+ "ctags", |
|
| 65 |
+ "curl", |
|
| 66 |
+ "curl-libs", |
|
| 67 |
+ "cve-check-tool", |
|
| 68 |
+ "cyrus-sasl", |
|
| 69 |
+ "cython3", |
|
| 70 |
+ "dbus", |
|
| 71 |
+ "ddclient", |
|
| 72 |
+ "deltarpm", |
|
| 73 |
+ "device-mapper", |
|
| 74 |
+ "device-mapper-event", |
|
| 75 |
+ "device-mapper-event-libs", |
|
| 76 |
+ "device-mapper-libs", |
|
| 77 |
+ "diffutils", |
|
| 78 |
+ "dkms", |
|
| 79 |
+ "dnsmasq", |
|
| 80 |
+ "docbook-xml", |
|
| 81 |
+ "docbook-xsl", |
|
| 82 |
+ "docker", |
|
| 83 |
+ "dracut", |
|
| 84 |
+ "dracut-tools", |
|
| 85 |
+ "e2fsprogs", |
|
| 86 |
+ "e2fsprogs-libs", |
|
| 87 |
+ "ebtables", |
|
| 88 |
+ "elfutils", |
|
| 89 |
+ "elfutils-libelf", |
|
| 90 |
+ "etcd", |
|
| 91 |
+ "ethtool", |
|
| 92 |
+ "eventlog", |
|
| 93 |
+ "expat", |
|
| 94 |
+ "expat-libs", |
|
| 95 |
+ "fakeroot-ng", |
|
| 96 |
+ "file", |
|
| 97 |
+ "filesystem", |
|
| 98 |
+ "findutils", |
|
| 99 |
+ "flannel", |
|
| 100 |
+ "flex", |
|
| 101 |
+ "fuse", |
|
| 102 |
+ "gawk", |
|
| 103 |
+ "gcc", |
|
| 104 |
+ "gdb", |
|
| 105 |
+ "gdbm", |
|
| 106 |
+ "gettext", |
|
| 107 |
+ "git", |
|
| 108 |
+ "git-lang", |
|
| 109 |
+ "glib", |
|
| 110 |
+ "glib-networking", |
|
| 111 |
+ "glibc", |
|
| 112 |
+ "glibc-devel", |
|
| 113 |
+ "glibc-lang", |
|
| 114 |
+ "glibmm", |
|
| 115 |
+ "gmp", |
|
| 116 |
+ "gnupg", |
|
| 117 |
+ "gnutls", |
|
| 118 |
+ "go", |
|
| 119 |
+ "gobject-introspection", |
|
| 120 |
+ "gperf", |
|
| 121 |
+ "gpgme", |
|
| 122 |
+ "gptfdisk", |
|
| 123 |
+ "grep", |
|
| 124 |
+ "groff", |
|
| 125 |
+ "grub2", |
|
| 126 |
+ "grub2-efi", |
|
| 127 |
+ "grub2-lang", |
|
| 128 |
+ "grub2-pc", |
|
| 129 |
+ "gzip", |
|
| 130 |
+ "haproxy", |
|
| 131 |
+ "haveged", |
|
| 132 |
+ "hawkey", |
|
| 133 |
+ "httpd", |
|
| 134 |
+ "iana-etc", |
|
| 135 |
+ "initramfs", |
|
| 136 |
+ "intltool", |
|
| 137 |
+ "iproute2", |
|
| 138 |
+ "iptables", |
|
| 139 |
+ "iputils", |
|
| 140 |
+ "jq", |
|
| 141 |
+ "json-c", |
|
| 142 |
+ "json-glib", |
|
| 143 |
+ "kbd", |
|
| 144 |
+ "kmod", |
|
| 145 |
+ "krb5", |
|
| 146 |
+ "kubernetes", |
|
| 147 |
+ "less", |
|
| 148 |
+ "libacl", |
|
| 149 |
+ "libaio", |
|
| 150 |
+ "libarchive", |
|
| 151 |
+ "libassuan", |
|
| 152 |
+ "libcap", |
|
| 153 |
+ "libcap-ng", |
|
| 154 |
+ "libdb", |
|
| 155 |
+ "libdnet", |
|
| 156 |
+ "libevent", |
|
| 157 |
+ "libffi", |
|
| 158 |
+ "libgcc", |
|
| 159 |
+ "libgcc-atomic", |
|
| 160 |
+ "libgcc-devel", |
|
| 161 |
+ "libgcrypt", |
|
| 162 |
+ "libgomp", |
|
| 163 |
+ "libgomp-devel", |
|
| 164 |
+ "libgpg-error", |
|
| 165 |
+ "libgsystem", |
|
| 166 |
+ "libhif", |
|
| 167 |
+ "libksba", |
|
| 168 |
+ "libltdl", |
|
| 169 |
+ "libmspack", |
|
| 170 |
+ "libpcap", |
|
| 171 |
+ "libpipeline", |
|
| 172 |
+ "librepo", |
|
| 173 |
+ "libseccomp", |
|
| 174 |
+ "libselinux", |
|
| 175 |
+ "libselinux-python3", |
|
| 176 |
+ "libselinux-utils", |
|
| 177 |
+ "libsepol", |
|
| 178 |
+ "libsigc++", |
|
| 179 |
+ "libsolv", |
|
| 180 |
+ "libsoup", |
|
| 181 |
+ "libssh2", |
|
| 182 |
+ "libstdc++", |
|
| 183 |
+ "libstdc++-devel", |
|
| 184 |
+ "libtasn1", |
|
| 185 |
+ "libtirpc", |
|
| 186 |
+ "libtool", |
|
| 187 |
+ "libxml2", |
|
| 188 |
+ "libxml2-devel", |
|
| 189 |
+ "libxslt", |
|
| 190 |
+ "libyaml", |
|
| 191 |
+ "linux", |
|
| 192 |
+ "linux-api-headers", |
|
| 193 |
+ "lsof", |
|
| 194 |
+ "lua", |
|
| 195 |
+ "lvm2", |
|
| 196 |
+ "lvm2-libs", |
|
| 197 |
+ "lzo", |
|
| 198 |
+ "lzo-minilzo", |
|
| 199 |
+ "m4", |
|
| 200 |
+ "make", |
|
| 201 |
+ "man-db", |
|
| 202 |
+ "man-pages", |
|
| 203 |
+ "mkinitcpio", |
|
| 204 |
+ "motd", |
|
| 205 |
+ "mpc", |
|
| 206 |
+ "mpfr", |
|
| 207 |
+ "nano", |
|
| 208 |
+ "ncurses", |
|
| 209 |
+ "ncurses-compat", |
|
| 210 |
+ "ncurses-libs", |
|
| 211 |
+ "ncurses-terminfo", |
|
| 212 |
+ "net-tools", |
|
| 213 |
+ "netmgmt", |
|
| 214 |
+ "nettle", |
|
| 215 |
+ "newt", |
|
| 216 |
+ "nfs-utils", |
|
| 217 |
+ "npth", |
|
| 218 |
+ "nspr", |
|
| 219 |
+ "nss", |
|
| 220 |
+ "nss-altfiles", |
|
| 221 |
+ "nss-libs", |
|
| 222 |
+ "ntp", |
|
| 223 |
+ "open-vm-tools", |
|
| 224 |
+ "openjdk8", |
|
| 225 |
+ "openjdk8-doc", |
|
| 226 |
+ "openjdk8-sample", |
|
| 227 |
+ "openjdk8-src", |
|
| 228 |
+ "openjre8", |
|
| 229 |
+ "openldap", |
|
| 230 |
+ "openssh", |
|
| 231 |
+ "openssh-clients", |
|
| 232 |
+ "openssh-server", |
|
| 233 |
+ "openssl", |
|
| 234 |
+ "openssl-c_rehash", |
|
| 235 |
+ "openssl-perl", |
|
| 236 |
+ "openvswitch", |
|
| 237 |
+ "openvswitch-doc", |
|
| 238 |
+ "ostree", |
|
| 239 |
+ "parted", |
|
| 240 |
+ "patch", |
|
| 241 |
+ "pcre", |
|
| 242 |
+ "pcre-libs", |
|
| 243 |
+ "perl", |
|
| 244 |
+ "perl-CGI", |
|
| 245 |
+ "perl-Canary-Stability", |
|
| 246 |
+ "perl-Config-IniFiles", |
|
| 247 |
+ "perl-DBD-SQLite", |
|
| 248 |
+ "perl-DBI", |
|
| 249 |
+ "perl-DBIx-Simple", |
|
| 250 |
+ "perl-Exporter-Tiny", |
|
| 251 |
+ "perl-File-HomeDir", |
|
| 252 |
+ "perl-File-Which", |
|
| 253 |
+ "perl-IO-Socket-SSL", |
|
| 254 |
+ "perl-JSON-Any", |
|
| 255 |
+ "perl-JSON-XS", |
|
| 256 |
+ "perl-List-MoreUtils", |
|
| 257 |
+ "perl-Module-Build", |
|
| 258 |
+ "perl-Module-Install", |
|
| 259 |
+ "perl-Module-ScanDeps", |
|
| 260 |
+ "perl-Net-SSLeay", |
|
| 261 |
+ "perl-Object-Accessor", |
|
| 262 |
+ "perl-Types-Serialiser", |
|
| 263 |
+ "perl-WWW-Curl", |
|
| 264 |
+ "perl-YAML", |
|
| 265 |
+ "perl-YAML-Tiny", |
|
| 266 |
+ "perl-common-sense", |
|
| 267 |
+ "perl-libintl", |
|
| 268 |
+ "pgbouncer", |
|
| 269 |
+ "photon-release", |
|
| 270 |
+ "photon-repos", |
|
| 271 |
+ "pinentry", |
|
| 272 |
+ "pkg-config", |
|
| 273 |
+ "popt", |
|
| 274 |
+ "postgresql", |
|
| 275 |
+ "postgresql-libs", |
|
| 276 |
+ "procps-ng", |
|
| 277 |
+ "psmisc", |
|
| 278 |
+ "pycurl3", |
|
| 279 |
+ "python-six", |
|
| 280 |
+ "python-xml", |
|
| 281 |
+ "python2", |
|
| 282 |
+ "python2-libs", |
|
| 283 |
+ "python3", |
|
| 284 |
+ "python3-PyYAML", |
|
| 285 |
+ "python3-asn1crypto", |
|
| 286 |
+ "python3-cffi", |
|
| 287 |
+ "python3-configobj", |
|
| 288 |
+ "python3-cryptography", |
|
| 289 |
+ "python3-gobject-introspection", |
|
| 290 |
+ "python3-hawkey", |
|
| 291 |
+ "python3-idna", |
|
| 292 |
+ "python3-iniparse", |
|
| 293 |
+ "python3-jinja2", |
|
| 294 |
+ "python3-jsonpatch", |
|
| 295 |
+ "python3-jsonpointer", |
|
| 296 |
+ "python3-libs", |
|
| 297 |
+ "python3-lvm2-libs", |
|
| 298 |
+ "python3-lxml", |
|
| 299 |
+ "python3-markupsafe", |
|
| 300 |
+ "python3-oauthlib", |
|
| 301 |
+ "python3-packaging", |
|
| 302 |
+ "python3-prettytable", |
|
| 303 |
+ "python3-pyasn1", |
|
| 304 |
+ "python3-pycparser", |
|
| 305 |
+ "python3-pyparsing", |
|
| 306 |
+ "python3-requests", |
|
| 307 |
+ "python3-setuptools", |
|
| 308 |
+ "python3-six", |
|
| 309 |
+ "python3-tools", |
|
| 310 |
+ "python3-xml", |
|
| 311 |
+ "python3-yum-metadata-parser", |
|
| 312 |
+ "readline", |
|
| 313 |
+ "rpcbind", |
|
| 314 |
+ "rpm", |
|
| 315 |
+ "rpm-build", |
|
| 316 |
+ "rpm-devel", |
|
| 317 |
+ "rpm-lang", |
|
| 318 |
+ "rpm-libs", |
|
| 319 |
+ "rpm-ostree", |
|
| 320 |
+ "ruby", |
|
| 321 |
+ "sed", |
|
| 322 |
+ "sed-lang", |
|
| 323 |
+ "shadow", |
|
| 324 |
+ "slang", |
|
| 325 |
+ "socat", |
|
| 326 |
+ "sqlite-libs", |
|
| 327 |
+ "sshpass", |
|
| 328 |
+ "strace", |
|
| 329 |
+ "subversion", |
|
| 330 |
+ "sudo", |
|
| 331 |
+ "swig", |
|
| 332 |
+ "syslog-ng", |
|
| 333 |
+ "systemd", |
|
| 334 |
+ "tar", |
|
| 335 |
+ "tcp_wrappers", |
|
| 336 |
+ "tcpdump", |
|
| 337 |
+ "tcsh", |
|
| 338 |
+ "tdnf", |
|
| 339 |
+ "texinfo", |
|
| 340 |
+ "thin-provisioning-tools", |
|
| 341 |
+ "tzdata", |
|
| 342 |
+ "unzip", |
|
| 343 |
+ "util-linux", |
|
| 344 |
+ "util-linux-lang", |
|
| 345 |
+ "util-linux-libs", |
|
| 346 |
+ "vim", |
|
| 347 |
+ "vim-extra", |
|
| 348 |
+ "wget", |
|
| 349 |
+ "which", |
|
| 350 |
+ "xerces-c", |
|
| 351 |
+ "xinetd", |
|
| 352 |
+ "xml-security-c", |
|
| 353 |
+ "xz", |
|
| 354 |
+ "xz-libs", |
|
| 355 |
+ "zlib", |
|
| 356 |
+ "zookeeper" |
|
| 357 |
+ ] |
|
| 358 |
+} |
| 0 | 359 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,46 @@ |
| 0 |
+{
|
|
| 1 |
+ "comment": "Photon Minimal OSTree", |
|
| 2 |
+ |
|
| 3 |
+ "osname": "photon", |
|
| 4 |
+ |
|
| 5 |
+ "ref": "photon/2.0/x86_64/minimal", |
|
| 6 |
+ |
|
| 7 |
+ "automatic_version_prefix": "2.0_minimal", |
|
| 8 |
+ |
|
| 9 |
+ "repos": ["photon", "photon-updates"], |
|
| 10 |
+ |
|
| 11 |
+ "selinux": false, |
|
| 12 |
+ |
|
| 13 |
+ "initramfs-args": ["--no-hostonly"], |
|
| 14 |
+ |
|
| 15 |
+ "bootstrap_packages": ["filesystem"], |
|
| 16 |
+ |
|
| 17 |
+ "documentation": false, |
|
| 18 |
+ |
|
| 19 |
+ "packages": [ |
|
| 20 |
+ "bash", "bc", "bridge-utils", "bzip2", |
|
| 21 |
+ "ca-certificates", "cloud-init", "coreutils", "cpio", "cracklib", "cracklib-dicts", "curl", |
|
| 22 |
+ "dbus", "docker", |
|
| 23 |
+ "e2fsprogs", "e2fsprogs-libs", "expat", |
|
| 24 |
+ "file", "findutils", |
|
| 25 |
+ "gdbm", "glibc", "gmp", "grub2", "gzip", |
|
| 26 |
+ "hawkey", |
|
| 27 |
+ "iana-etc", "initramfs", "iproute2", "iptables", |
|
| 28 |
+ "kmod", |
|
| 29 |
+ "libcap", "libgcc", "libdnet", "libmspack", "libstdc++", "libtool", "libyaml", "linux", |
|
| 30 |
+ "motd", |
|
| 31 |
+ "ncurses", "net-tools", "nss-altfiles", |
|
| 32 |
+ "openssh", "openssl", "open-vm-tools", |
|
| 33 |
+ "photon-release", "photon-repos", "pkg-config", "procps-ng", |
|
| 34 |
+ "python3", "python3-configobj", "python3-jinja2", "python3-jsonpatch", "python3-jsonpointer", "python3-libs", "python3-markupsafe", |
|
| 35 |
+ "python3-oauthlib", "python3-prettytable", "python3-PyYAML", "python3-requests", "python3-setuptools", "python3-six", "python3-xml", |
|
| 36 |
+ "readline", "rpm", "rpm-ostree", |
|
| 37 |
+ "shadow","systemd", |
|
| 38 |
+ "tdnf", "tzdata", |
|
| 39 |
+ "util-linux", |
|
| 40 |
+ "vim", |
|
| 41 |
+ "which", |
|
| 42 |
+ "xerces-c", "xml-security-c", "xz", |
|
| 43 |
+ "zlib" |
|
| 44 |
+ ] |
|
| 45 |
+} |