PR#27: Update config for twoweek compose - pungi-fedora

pungi-fedora

#27 Update config for twoweek compose

Merged 7 years ago by ausil. Opened 7 years ago by lsedlar.

lsedlar/pungi-fedora twoweek into f24

Update config for twoweek compose

Lubomír Sedlář • 7 years ago

ea415a4

fedora-atomic.conf

file modified

+20 -22

		`@@ -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 @@`

		`# 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 - 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 @@`
		`#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 @@`
		`'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 @@`
		`'distro': 'Fedora-20',`
		`'disk_size': 3,`
		`'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'`
		`}`
		`},`
		`@@ -320,8 +319,8 @@`
		`'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'`
		`}`
		`},`
		`@@ -337,8 +336,8 @@`
		`'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'`
		`}`
		`},`
		`@@ -354,8 +353,8 @@`
		`'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'`
		`}`
		`}`
		`@@ -365,7 +364,7 @@`
		`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"],`
		`@@ -386,5 +385,4 @@`
		`})`
		`]`

		`- release_id_allow_missing = True`
		`koji_profile = 'koji'`

twoweek-nightly.sh

file modified

+1 -1

		`@@ -7,7 +7,7 @@`
		`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"`

lsedlar commented 7 years ago

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.

lsedlar commented 7 years ago

Even with this patch it does not work on stage, though. There are mysterious failures in buildinstall phase:

http://koji.stg.fedoraproject.org/koji/taskinfo?taskID=90024191

ausil commented 7 years ago

buildinstall phase should not even run.

ausil commented on line 15 of fedora-atomic.conf 7 years ago

This is not correct, we should be using the cloud installer that already exists, we do not need to make or deliver a cloud install tree

lsedlar commented 7 years ago

This will probably require a code change in pungi. I can point image building to use repos from https://kojipkgs.fedoraproject.org/compose/24/latest-Fedora-/compose/Cloud/$arch/os/, but the install tree must be taken from some variant in the current compose, which is not desirable here.

I will try another test compose with this patch and updated config.

rebased

7 years ago

lsedlar commented 7 years ago

The latest patch points image building at latest F24 compose. It depends on https://pagure.io/pungi/pull-request/307. I have also skipped a lot of phases that I think are not needed, which makes it quite fast.

Testing it in stage failed, because the builders can't reach kojipkgs:
http://koji.stg.fedoraproject.org/koji/taskinfo?taskID=90024928

If I point it to rawhide repos/install trees built previously in stage, it fails in some due to waiting for input (http://koji.stg.fedoraproject.org/koji/taskinfo?taskID=90024971), but at least one image was successful: http://koji.stg.fedoraproject.org/koji/taskinfo?taskID=90024973.

There is at least one more issue with ostree installer: it also insists on source repo from current compose. Patch will follow shortly.

lsedlar commented 7 years ago

I updated the pungi PR to fix ostree installer as well. The task started fine, but failed with error in template command:
http://koji.stg.fedoraproject.org/koji/taskinfo?taskID=90024978