Let pungi produce comps file in rawhide composes

- change comps_file setting in the fedora.conf to use the new scm_dict
  type from the latest pungi release
- remove the make step from the nightly shell script

Signed-off-by: Robert Marshall <rmarshall@redhat.com>

fedora.conf

@@ -6,12 +6,13 @@ release_is_layered = False
 
 # 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',
-#}
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-rawhide.xml',
+    'command': 'make comps-rawhide.xml'
+}
 
 variants_file='variants-fedora.xml'
 sigkeys = ['9DB62FB1']

nightly.sh

@@ -46,14 +46,14 @@ FEDMSG_CERTPREFIX="releng"
 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
+#pushd $TMPDIR
+#git clone https://pagure.io/fedora-comps.git && {
+#    pushd fedora-comps
+#    make "${COMPSFILE}"
+#    cp "${COMPSFILE}" $DEST/
+#    popd
+#}
+#popd
 
 #./releng/scripts/block_retired.py --profile compose_koji
 ./releng/scripts/block_retired.py --profile compose_koji --namespace=docker