diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-20 14:38:50 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-08-20 14:40:14 -0400 |
| commit | d5c93545f292e9d5e41922cbe0d9ae0b66fcdb3a (patch) | |
| tree | da0bebf81dc715f9d7a877d7cec466a497c35c39 | |
| parent | aa8d5f7d998c155381c955597171449db22fd2ac (diff) | |
CPERF: Install ODL tools and log
Adds pip installing odltools into the cperf container. CSIT jobs now
fetch ODL and other OS logs via apex.
Change-Id: I532d3a6fed156709cb305a9f7a6721d1db2eaebc
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yaml | 10 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 11 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 11 | ||||
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 1 |
4 files changed, 33 insertions, 0 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 194924bb9..b810a2998 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -176,6 +176,16 @@ kill-phase-on: FAILURE abort-all-job: false - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - multijob: name: postprocess condition: ALWAYS projects: diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 5d5afc1c9..d48ea262b 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -916,6 +916,17 @@ node-parameters: true kill-phase-on: FAILURE abort-all-job: false + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - multijob: name: create snapshot condition: SUCCESSFUL diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 8d5c673dd..31e3bd8f3 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -800,6 +800,17 @@ node-parameters: true kill-phase-on: FAILURE abort-all-job: false + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false - multijob: name: create snapshot condition: SUCCESSFUL diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 0f4bb234b..70fde91b1 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -166,6 +166,7 @@ docker run -i --net=host \ opnfv/cperf:$DOCKER_TAG \ /bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \ cd /home/opnfv/repos/odl_test/ && git pull origin master; \ + pip install odltools; \ ${robot_cmd} ${suites};" echo "Running post CSIT clean" |