From 377c3d7aa691a9aebf40704fcc70d5c1a35e5646 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 25 May 2018 12:18:29 +0100
Subject: [PATCH] bring container script naming changes forward from 28, update
 a little for F-29

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 docker-nightly.sh => container-nightly.sh | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
 rename docker-nightly.sh => container-nightly.sh (88%)

diff --git a/docker-nightly.sh b/container-nightly.sh
similarity index 88%
rename from docker-nightly.sh
rename to container-nightly.sh
index b74561b..a850a76 100755
--- a/docker-nightly.sh
+++ b/container-nightly.sh
@@ -4,18 +4,17 @@ LABEL=$1
 # Remove the label from arguments. It gets special treatment. Other arguments
 # to the script are passed to pungi-koji directly.
 shift
-CONFIG="fedora-docker.conf"
+CONFIG="fedora-container.conf"
 TARGET_DIR="/mnt/koji/compose/container"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
-SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Docker"
-RELEASE="27"
-RELEASE_TITLE="27"
-COMPSFILE="comps-f27.xml"
+RELEASE="29"
+RELEASE_TITLE="29"
+COMPSFILE="comps-f29.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@@ -39,15 +38,7 @@ FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting...
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} 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 --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else