diff options
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 13 |
2 files changed, 16 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index de7ca6af1..eeeb9e4a7 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -234,27 +234,27 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 0 * * *' + - timed: '0 23 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 4 * * *' + - timed: '0 2 * * *' - trigger: name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 8 * * *' + - timed: '0 5 * * *' - trigger: name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 12 * * *' + - timed: '0 8 * * *' - trigger: name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 16 * * *' + - timed: '0 11 * * *' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 14 * * *' - trigger: name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger' triggers: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index c3459fdab..631a33f41 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -352,8 +352,11 @@ -type f -name "*.py" -print | \ xargs flake8 --exit-zero -qq --count 2>&1)" + # Ensure we start with a clean environment + rm -f lint.log + if [ ! -z $FLAKE_COUNT ]; then - echo "Flake8 Violations: $FLAKE_COUNT" >> lint.log + echo "Flake8 Violations: $FLAKE_COUNT" > lint.log find . \ -path './releng_flake8' -prune -o \ -type f -name "*.py" -print | \ @@ -363,8 +366,6 @@ cat violation.log >> lint.log sed -r -i '4,$s/^/ /g' lint.log rm violation.log - else - echo -e "Flake8 Violations: 0" > lint.log fi deactivate @@ -378,15 +379,21 @@ set -o pipefail set -o xtrace export PATH=$PATH:/usr/local/bin/ + + # If no violations were found, no lint log will exist. if [[ -e lint.log ]] ; then echo -e "\nposting linting report to gerrit...\n" + cat lint.log echo + ssh -p 29418 gerrit.opnfv.org \ "gerrit review -p $GERRIT_PROJECT \ -m \"$(cat lint.log)\" \ $GERRIT_PATCHSET_REVISION \ --notify NONE" + + exit 1 fi - builder: |