From 23f4f25b7582f883ac121320ac21fbae1cca6413 Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: May 26 2016 22:12:29 +0000 Subject: Update config for twoweek compose * It is not a layered product (otherwise base_product would need to be configured). * Add Cloud variant. Its repos are used in image_build section. * Add source repositories. They are needed for depsolving. * Remove release_id_allow_missing, which should be product_id_ and only makes sense if product_id is configured. * Remove notification_script, as this is handled by CLI option * Remove link_files: it's called link_type and hardlink-or-copy is default. * Set bootable to False, we don't need buildinstall here. * Use repos and install trees from regular F24 compose for building images * Skip some phases to make it faster: we don't need to gather any packages, so we can skip pkgset, gather and extra_files phases. Signed-off-by: Lubomír Sedlář --- diff --git a/fedora-atomic.conf b/fedora-atomic.conf index 9f1e58d..4a3830d 100644 --- a/fedora-atomic.conf +++ b/fedora-atomic.conf @@ -2,10 +2,10 @@ release_name = 'Fedora' release_short = 'Fedora' release_version = '24' -release_is_layered = True +release_is_layered = False # GENERAL SETTINGS -bootable = True +bootable = False comps_file = 'comps-f24.xml' #{ # 'scm': 'git', # 'repo': 'git://git.fedorahosted.org/git/comps.git', @@ -23,7 +23,7 @@ tree_arches = ['i386', 'x86_64', 'armhfp'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['Atomic', 'CloudImages', 'Docker'] +tree_variants = ['Atomic', 'Cloud', 'CloudImages', 'Docker'] hashed_directories = True @@ -39,9 +39,12 @@ pkgset_source = 'repos' # koji, repos # PKGSET - REPOS # pkgset_repos format: {arch: [repo1_url, repo2_url, ...]} -pkgset_repos = {'x86_64': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/x86_64/os/'], - 'i386': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/i386/os/'], - 'armhfp': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/x86_64/os/'],} +pkgset_repos = {'x86_64': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/x86_64/os/', + 'https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/source/tree/'], + 'i386': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/i386/os/', + 'https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/source/tree/'], + 'armhfp': ['https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/x86_64/os/', + 'https://kojipkgs.fedoraproject.org/pub/alt/development/24/Cloud/source/tree/']} filter_system_release_packages = False @@ -60,10 +63,6 @@ greedy_method = 'build' #gather_source_mapping = '/path/to/mapping.json' -link_files = 'hardlink-or-copy' - -notification_script = '/usr/bin/pungi-fedmsg-notification' - # CREATEREPO createrepo_c = True createrepo_checksum = 'sha256' @@ -284,8 +283,8 @@ image_build = { 'distro': 'Fedora-20', 'disk_size': 3, 'arches': ['x86_64', 'armhfp'], - 'repo_from': 'Cloud', - 'install_tree_from': 'Cloud', + 'repo': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', 'subvariant': 'Docker_Base' } } @@ -303,8 +302,8 @@ image_build = { 'distro': 'Fedora-20', 'disk_size': 3, 'arches': ['x86_64', 'i386'], - 'repo_from': 'Cloud', - 'install_tree_from': 'Cloud', + 'repo': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', 'subvariant': 'Cloud_Base' } }, @@ -320,8 +319,8 @@ image_build = { 'distro': 'Fedora-20', 'disk_size': 40, 'arches': ['x86_64'], - 'repo_from': 'Cloud', - 'install_tree_from': 'Cloud', + 'repo': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', 'subvariant': 'Cloud_Base', 'ova-option': 'vagrant_sync_directory=/home/vagrant/sync' } @@ -338,8 +337,8 @@ image_build = { 'distro': 'Fedora-20', 'disk_size': 6, 'arches': ['x86_64'], - 'repo_from': 'Cloud', - 'install_tree_from': 'Cloud', + 'repo': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', 'subvariant': 'Atomic' } }, @@ -355,8 +354,8 @@ image_build = { 'distro': 'Fedora-20', 'disk_size': 40, 'arches': ['x86_64'], - 'repo_from': 'Cloud', - 'install_tree_from': 'Cloud', + 'repo': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/', 'subvariant': 'Atomic' } } @@ -366,7 +365,7 @@ image_build = { ostree_installer = [ ("^Atomic$", { "x86_64": { - "source_repo_from": "Everything", + "source_repo_from": "http://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Everything/$arch/os/", "release": None, "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso", "installpkgs": ["fedora-productimg-atomic"], @@ -387,5 +386,4 @@ ostree_installer = [ }) ] -release_id_allow_missing = True koji_profile = 'koji' diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index ccab454..c940ec8 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -7,7 +7,7 @@ CONFIG="fedora-atomic.conf" TARGET_DIR="/mnt/koji/compose/twoweek" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" NIGHTLY="--nightly" -SKIP_PHASES="--skip-phase=productimg" +SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files" DEST=$(pwd) DATE=$(date "+%Y%m%d") DIST="24"