From 8958d98c8e425e642dfc3587cad51cb5abe36f38 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 2 Jul 2019 13:54:55 +0000 Subject: [PATCH] make sure the weekly cron job runs as ftbfs --- roles/releng/files/ftbfs.cron | 32 +------------------------------- roles/releng/files/ftbfs.sh | 3 +++ roles/releng/tasks/main.yml | 6 ++++++ 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/roles/releng/files/ftbfs.cron b/roles/releng/files/ftbfs.cron index d09af72942..82bd12c93d 100644 --- a/roles/releng/files/ftbfs.cron +++ b/roles/releng/files/ftbfs.cron @@ -1,32 +1,2 @@ -#!/bin/bash -# A weekly cron job which actually does the items needed. -TMPDIR=`mktemp -d /tmp/ftbfs_reminder.XXXXXX` -GITREPO=https://pagure.io/releng.git -SCRIPT=ftbfs_weekly_reminder.py -if [ $? -eq 0 ]; then - cd ${TMPDIR} - git clone ${GITREPO} - if [ $? -eq 0 ]; then - cd releng/scripts - ./${SCRIPT} - if [ $? -ne 0 ]; then - echo "${SCRIPT} had an error condition" - echo "Look in ${TMPDIR} for more info" - # Do not clean up trash - exit 1 - fi - else - echo "Unable to clone ${GITREPO}" - echo "Look in ${TMPDIR} for more info" - # Do not clean up trash - exit 1 - fi - cd /tmp/ - rm -rf $TMPDIR -else - echo "Unable to create ${TMPDIR}" - exit 1 -fi - #FTBFS Weekly Reminder - +su - ftbfs /usr/local/bin/ftbsh.sh diff --git a/roles/releng/files/ftbfs.sh b/roles/releng/files/ftbfs.sh index 6d23289bb2..d09af72942 100644 --- a/roles/releng/files/ftbfs.sh +++ b/roles/releng/files/ftbfs.sh @@ -27,3 +27,6 @@ else echo "Unable to create ${TMPDIR}" exit 1 fi + +#FTBFS Weekly Reminder + diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index f270537d6c..76fd7ff0aa 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -49,6 +49,12 @@ tags: - ftbfs +- name: copy ftbfs weekly script + copy: src="ftbfs.sh" dest=/usr/local/bin/ftbfs.sh mode=755 + when: inventory_hostname.startswith('compose-x86-01') + tags: + - ftbfs + - name: add ftbfs weekly cron job copy: src="ftbfs.cron" dest=/etc/cron.weekly/ mode=755 when: inventory_hostname.startswith('compose-x86-01')