From 248019e7f40011002c28830dad61bba203d90eae Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Fri, 21 Jul 2017 11:34:51 -0700 Subject: [PATCH] Revert "Comment Pending JJB Changes on Patchset" There are obviously way more issues than expected with this change and it is currently blocking releng verification. This reverts commit 97b70892a76351da03f981ff4559aabfed0e0840. Change-Id: I871e35fc0dd36dbdee315b6efbe3d7fb99e38463 Signed-off-by: Trevor Bramwell --- jjb/releng/generate-job-list.sh | 68 ----------------------------------------- jjb/releng/releng-ci-jobs.yml | 4 --- 2 files changed, 72 deletions(-) delete mode 100755 jjb/releng/generate-job-list.sh diff --git a/jjb/releng/generate-job-list.sh b/jjb/releng/generate-job-list.sh deleted file mode 100755 index b32a514e5..000000000 --- a/jjb/releng/generate-job-list.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Job Number Formatter -function JOBS { - local NUMS=$1 - if [ $NUMS == 1 ]; then - echo -n "Job" - else - echo -n "Jobs" - fi -} - -# We expect job_output to exist prior to this being run and contain the -# output from jenkins-jobs test - -echo "> Generating list of previous JJB jobs..." -git checkout -q -b previous-commit HEAD^ -jenkins-jobs -l ERROR test -r jjb -o job_output_prev -git checkout -q - && git branch -q -d previous-commit - -echo "> Finding job changes ..." -diff -r -q job_output job_output_prev &> job_diff.txt || true - -# Only in (job_output) = NEW -# Only in (job_output_prev) = DELETED -# Files ... differ = MODIFIED - -declare -a JOBS_ADDED=($(grep 'job_output:' job_diff.txt | cut -d':' -f2- | sed 's/^[ \t]*//;s/[ \t]*$//')) -declare -a JOBS_MODIFIED=($(grep 'differ$' job_diff.txt | sed "s/Files job_output\/\(.*\) and.*/\1/g")) -declare -a JOBS_REMOVED=($(grep 'job_output_prev:' job_diff.txt | cut -d ':' -f2- | sed 's/^[ \t]*//;s/[ \t]*$//')) - -NUM_JOBS_ADDED=${#JOBS_ADDED[@]} -NUM_JOBS_MODIFIED=${#JOBS_MODIFIED[@]} -NUM_JOBS_REMOVED=${#JOBS_REMOVED[@]} - -echo "> Writing gerrit comment ..." -if [ $NUM_JOBS_ADDED -gt 0 ]; then - JOB_STRING="$(JOBS $NUM_JOBS_ADDED)" - { printf "Added %s %s:\n\n" "${NUM_JOBS_ADDED}" "$JOB_STRING"; - printf '* %s\n' "${JOBS_ADDED[@]}"; - printf "\n"; } >> gerrit_comment.txt -fi - -if [ $NUM_JOBS_MODIFIED -gt 0 ]; then - JOB_STRING="$(JOBS $NUM_JOBS_MODIFIED)" - { printf "Modified %s %s:\n\n" "${NUM_JOBS_MODIFIED}" "$JOB_STRING"; - printf '* %s\n' "${JOBS_MODIFIED[@]}"; - printf "\n"; } >> gerrit_comment.txt -fi - -if [ $NUM_JOBS_REMOVED -gt 0 ]; then - JOB_STRING="$(JOBS $NUM_JOBS_REMOVED)" - { printf "Removed %s %s:\n\n" "${NUM_JOBS_REMOVED}" "$JOB_STRING"; - printf '* %s\n' "${JOBS_REMOVED[@]}"; - printf "\n"; } >> gerrit_comment.txt -fi diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index be291b00d..ecc87303f 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -48,10 +48,6 @@ builders: - shell: !include-raw: verify-releng.sh - - shell: - !include-raw-escape: generate-job-list.sh - - report-build-result-to-gerrit - publishers: - archive-artifacts: -- 2.16.6