diff options
| -rwxr-xr-x | update_jdn.sh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/update_jdn.sh b/update_jdn.sh index e8aad062..a1de892f 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -660,31 +660,12 @@ if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "profitbricks-build3-amd64" ] fi # -# There's always some work left... -# echo FIXME is ignored so check-jobs scripts can output templates requiring manual work -# -if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then - rgrep FI[X]ME $BASEDIR/* | grep -v echo > $TMPFILE || true - if [ -s $TMPFILE ] ; then - echo - # only show cucumber FIXMEs when deploying on jenkins-test-vm - if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then - cat $TMPFILE - else - cat $TMPFILE | grep -v cucumber - fi - echo - fi - rm -f $TMPFILE -fi - -# # Create GPG key for jenkins user if they do not already exist (eg. to sign .buildinfo files) # if sudo -u jenkins gpg --with-colons --fixed-list-mode --list-secret-keys | cut -d: -f1 | grep -qsFx 'sec' >/dev/null 2>&1 ; then - explain "$(date) Not generating GPG key as one already exists" + explain "$(date) - Not generating GPG key as one already exists for jenkins user." else - explain "$(date) Generating GPG key" + explain "$(date) - Generating GPG key for jenkins user." sudo -u jenkins gpg --no-tty --batch --gen-key <<EOF Key-Type: RSA @@ -700,6 +681,25 @@ EOF fi # +# There's always some work left... +# echo FIXME is ignored so check-jobs scripts can output templates requiring manual work +# +if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then + rgrep FI[X]ME $BASEDIR/* | grep -v echo > $TMPFILE || true + if [ -s $TMPFILE ] ; then + echo + # only show cucumber FIXMEs when deploying on jenkins-test-vm + if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then + cat $TMPFILE + else + cat $TMPFILE | grep -v cucumber + fi + echo + fi + rm -f $TMPFILE +fi + +# # almost finally… # sudo touch $STAMP # so on the next run, only configs newer than this file will be updated |