diff options
| -rwxr-xr-x | bin/d-i_check_jobs.sh | 9 | ||||
| -rwxr-xr-x | update_jdn.sh | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bin/d-i_check_jobs.sh b/bin/d-i_check_jobs.sh index 1b2a98d7..0d96f4cd 100755 --- a/bin/d-i_check_jobs.sh +++ b/bin/d-i_check_jobs.sh @@ -76,6 +76,7 @@ for DIRECTORY in * ; do if [ "$DIRECTORY" == "" ] ; then continue else + # FIXME: turn this into a loop: pdf html # # html build job # @@ -135,12 +136,12 @@ for DIRECTORY in * ; do # # prepare yaml bits # - echo " - '{name}_manual_${DIRECTORY}_html_po2xml':" >> $PROJECT_JOBS + echo " - '{name}_manual_${DIRECTORY}_html':" >> $PROJECT_JOBS echo " lang: '$DIRECTORY'" >> $PROJECT_JOBS echo " languagename: 'FIXME: $DIRECTORY'" >> $PROJECT_JOBS echo "- job-template:" >> $JOB_TEMPLATES echo " defaults: d-i-manual-html-po2xml" >> $JOB_TEMPLATES - echo " name: '{name}_manual_${DIRECTORY}_html_po2xml'" >> $JOB_TEMPLATES + echo " name: '{name}_manual_${DIRECTORY}_html'" >> $JOB_TEMPLATES fi # # pdf build job @@ -151,12 +152,12 @@ for DIRECTORY in * ; do # # prepare yaml bits # - echo " - '{name}_manual_${DIRECTORY}_pdf_po2xml':" >> $PROJECT_JOBS + echo " - '{name}_manual_${DIRECTORY}_pdf':" >> $PROJECT_JOBS echo " lang: '$DIRECTORY'" >> $PROJECT_JOBS echo " languagename: 'FIXME: $DIRECTORY'" >> $PROJECT_JOBS echo "- job-template:" >> $JOB_TEMPLATES echo " defaults: d-i-manual-pdf-po2ml" >> $JOB_TEMPLATES - echo " name: '{name}_manual_${DIRECTORY}_pdf_po2xml'" >> $JOB_TEMPLATES + echo " name: '{name}_manual_${DIRECTORY}_pdf'" >> $JOB_TEMPLATES fi fi done diff --git a/update_jdn.sh b/update_jdn.sh index fdafbd49..46db68f4 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -101,7 +101,8 @@ sudo chown jenkins /var/cache/pbuilder/result # # There's always some work left... +# echo FIXME is ignored so check-jobs scripts can output templates requiring manual work # echo -rgrep FIXME $BASEDIR/* | grep -v "rgrep FIXME" +rgrep FIXME $BASEDIR/* | grep -v "rgrep FIXME" | grep -v echo |