From a0392d815316e3ef515678ec02ea7d2570de0fc6 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Thu, 25 Oct 2018 09:42:22 -0700 Subject: [PATCH] Rework int/dist addition to MP test Current implementation does not work with gerrit and after enabling some debugs I still do not see why so I am changing the implementation. Change-Id: Icd930e265497cebb3f92b9ac0702455645c3bd15 Signed-off-by: Luis Gomez --- jjb/integration/integration-test-jobs.yaml | 6 +++--- jjb/integration/multipatch-distribution.sh | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 42424ee35..8cd6077fc 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -25,7 +25,7 @@ build-order: > odlparent yangtools infrautils mdsal controller serviceutils aaa netconf daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt - bgpcep + bgpcep integration/distribution - fluorine: branch: 'stable/fluorine' @@ -34,7 +34,7 @@ build-order: > odlparent yangtools infrautils mdsal controller serviceutils aaa netconf daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt - bgpcep + bgpcep integration/distribution - oxygen: branch: 'stable/oxygen' @@ -43,7 +43,7 @@ build-order: > odlparent yangtools infrautils mdsal controller serviceutils aaa netconf daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt - bgpcep + bgpcep integration/distribution - project: name: integration-distribution diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index d95962785..82220dff3 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -ex +set -e # create a fresh empty place to build this custom distribution BUILD_DIR=${WORKSPACE}/patch_tester @@ -42,8 +42,8 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then TOPIC="${PATCHES_TO_BUILD#*=}" echo "Create topic ${TOPIC} patch list" PATCHES_TO_BUILD="" - read -ra PROJECT_LIST <<< "${BUILD_ORDER} integration/distribution" - echo "${PROJECT_LIST[@]}" + read -ra PROJECT_LIST <<< "${BUILD_ORDER}" + echo "List of projects to check patch in topic: ${PROJECT_LIST[*]}" for PROJECT in "${PROJECT_LIST[@]}"; do # get all patches number for a topic for a given project IFS=$'\n' read -rd '' -a GERRIT_PATCH_LIST <<< "$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query status:open topic:${TOPIC} project:${PROJECT} \ @@ -82,7 +82,6 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then fi done fi -set +e echo "Patches to build: ${PATCHES_TO_BUILD}" IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}" -- 2.36.6