PR#406: Add comps to fedora-modular.conf - pungi-fedora

pungi-fedora

#406 Add comps to fedora-modular.conf

Closed 6 years ago by ausil. Opened 6 years ago by sgallagh.

sgallagh/pungi-fedora comps-rawhide into master

Stephen Gallagher • 6 years ago

2e4933f

fedora-modular.conf

file modified

		`@@ -6,6 +6,12 @@`

		`# GENERAL SETTINGS`
		`bootable = True`
		`+ comps_file = 'comps-rawhide.xml' #{`
		`+ # 'scm': 'git',`
		`+ # 'repo': 'https://pagure.io/fedora-comps.git',`
		`+ # 'branch': None, # defaults to cvs/HEAD or git/master`
		`+ # 'file': 'comps-f23.xml',`
		`+ #}`

		`variants_file='variants-modular.xml'`
		`sigkeys = ['a3cc4e62']`

nightly-modular.sh

file modified

+10

		`@@ -14,6 +14,7 @@`
		`DIST="bikeshed"`
		`BRANCHED="Modular-Bikeshed"`
		`BRANCH="rawhide"`
		`+ COMPSFILE="comps-rawhide.xml"`
		`GIT_BRANCH="master"`
		TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
		`TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"`
		`@@ -43,6 +44,15 @@`
		`fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")`
		`send_fedmsg "${fedmsg_json_start}" ${DIST} start`

		`+ pushd $TMPDIR`
		`+ git clone https://pagure.io/fedora-comps.git && {`
		`+ pushd fedora-comps`
		`+ make "${COMPSFILE}"`
		`+ cp "${COMPSFILE}" $DEST/`
		`+ popd`
		`+ }`
		`+ popd`
		`+`
		`CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"`

		`if [ -z "$COMPOSE_ID" ]; then`

sgallagh commented 6 years ago

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

ignatenkobrain commented 6 years ago

what's the point? modularity replaces comps so those should not be there... or am I missing something?

sgallagh commented 6 years ago

@ignatenkobrain You are missing something.

Right now, anaconda depends on comps.xml being available in order to translate the packages into Environment Groups that it can display on the software tab (and use to actually make a decision about which packages get installed). So we have to have comps.xml on the disk in order for Anaconda to be able to install anything at all via interactive (GUI or TUI) installations.

Without comps.xml, we can only do kickstart installs that specify individual packages directly.

rebased onto 2e4933f

6 years ago

mohanboddu commented 6 years ago

@sgallagh Since we are freeze, I cant update pungi on rawhide-composer.phx2.fedoraproject.org without a FBR. I will merge this after we are out of freeze and update pungi on the compose box.

sgallagh commented 6 years ago

@mohanboddu That's fine, we got the F27 one merged, so we aren't blocked.