#618 Move output from nightly container/cloud compose to dedicated directory, cleanup older than 14 days
Merged 6 years ago by mohanboddu. Opened 6 years ago by pbrobinson.
Unknown source f26-nightly-fixes  into  f26

file modified
+3 -1
@@ -6,7 +6,7 @@

  # to the script are passed to pungi-koji directly.

  shift

  CONFIG="fedora-cloud.conf"

- TARGET_DIR="/mnt/koji/compose"

+ TARGET_DIR="/mnt/koji/compose/cloud"

  #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"
@@ -87,3 +87,5 @@

  #    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \

  #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail

  #done

+ 

+ find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

file modified
+3 -1
@@ -5,7 +5,7 @@

  # to the script are passed to pungi-koji directly.

  shift

  CONFIG="fedora-docker.conf"

- TARGET_DIR="/mnt/koji/compose"

+ 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"
@@ -85,3 +85,5 @@

  #    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \

  #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail

  #done

+ 

+ find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

LGTM - the rm -rf scares me :)

actually let's just stop building these - f26 has got to be EOL any day now

Pull-Request has been merged by mohanboddu

6 years ago
Metadata