Merge "change voltha-protos to use make-unit-test isntead of legacy python-unit job template, increase size/timeout of executor"
diff --git a/jjb/verify/kafka-topic-exporter.yaml b/jjb/verify/kafka-topic-exporter.yaml
index 270ae1c..3231c4c 100644
--- a/jjb/verify/kafka-topic-exporter.yaml
+++ b/jjb/verify/kafka-topic-exporter.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-kafka-topic-exporter-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-kafka-topic-exporter-jobs'
- job-group:
name: 'verify-kafka-topic-exporter-jobs'
@@ -15,91 +16,15 @@
- 'verify-licensed'
- 'tag-collision-reject':
dependency-jobs: 'verify_kafka-topic-exporter_licensed'
- - 'verify-sonarqube':
- dependency-jobs: 'verify_kafka-topic-exporter_tag-collision'
- - 'kafka-topic-exporter-tests':
- dependency-jobs: 'verify_kafka-topic-exporter_sonarqube'
+ - 'make-unit-test':
+ build-timeout: 30
+ unit-test-targets: 'test docker-build'
+ junit-allow-empty-results: true
-- job-template:
- id: 'kafka-topic-exporter-tests'
- name: 'verify_{project}_tests'
-
- description: |
- Created by {id} job-template from ci-management/jjb/verify/kafka-topic-exporter.yaml
-
- triggers:
- - cord-infra-gerrit-trigger-patchset:
- gerrit-server-name: '{gerrit-server-name}'
- project-regexp: '^{project}$'
- branch-regexp: '{branch-regexp}'
- dependency-jobs: '{dependency-jobs}'
- file-include-regexp: '{all-files-regexp}'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: 20
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - cord-infra-gerrit-scm:
- git-url: '$GIT_URL/$GERRIT_PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: 'false'
- choosing-strategy: 'gerrit'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
- basedir: '{project}'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: freestyle
- concurrent: true
-
- builders:
- - shell: |
- #!/usr/bin/env bash
- set -eux -o pipefail
-
- export GOPATH=~/go
- export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:~/go/bin
-
- # move code the proper location
- mkdir -p $GOPATH/src/gerrit.opencord.org
- mv kafka-topic-exporter $GOPATH/src/gerrit.opencord.org/kafka-topic-exporter
-
- pushd $GOPATH/src/gerrit.opencord.org/kafka-topic-exporter
-
- # get prereqs
- dep ensure --vendor-only
-
- go test -v ./...
-
- # generate Jenkins report
- go test -v ./... 2>&1 | go-junit-report > $WORKSPACE/junit-report.xml
-
- # generate Jenkins coverage
- go test -coverprofile=coverage.txt -covermode=count ./...
- gocover-cobertura < coverage.txt > $WORKSPACE/coverage.xml
-
- popd
-
-
- publishers:
- - junit:
- results: "junit-report.xml"
- allow-empty-results: true
- - cobertura:
- report-file: "coverage.xml"
- targets:
- - files:
- healthy: 80
- unhealthy: 0
- failing: 0
- - method:
- healthy: 50
- unhealthy: 0
- failing: 0
+- job-group:
+ name: 'publish-kafka-topic-exporter-jobs'
+ jobs:
+ - 'docker-publish':
+ build-timeout: 30
+ docker-repo: 'opencord'
+ dependency-jobs: 'version-tag'