Merge "onlab ecord(global and local) to jjb"
diff --git a/jjb/helm-api-test.yaml b/jjb/helm-api-test.yaml
index 1e32c00..29aa8f3 100644
--- a/jjb/helm-api-test.yaml
+++ b/jjb/helm-api-test.yaml
@@ -1,11 +1,11 @@
---
-# CORD API tests using helm
+# Run CORD API robot tests in helm
- job-template:
id: helm-api-test
name: 'verify_{project}_helm-api-test'
description: |
- Created by helm-api-test job-template from ci-management/jjb/helm-api-test.yaml
+ Created by {id} job-template from ci-management/jjb/helm-api-test.yaml
triggers:
- cord-infra-gerrit-trigger-patchset:
diff --git a/jjb/pipeline/helm-api-test.groovy b/jjb/pipeline/helm-api-test.groovy
index 3a31332..1347466 100644
--- a/jjb/pipeline/helm-api-test.groovy
+++ b/jjb/pipeline/helm-api-test.groovy
@@ -45,7 +45,7 @@
steps {
sh '''
pushd cord/build
- ./scripts/imagebuilder.py -f ../helm-charts/examples/test-images.yaml
+ ./scripts/imagebuilder.py -f ../helm-charts/examples/api-test-images.yaml
popd
'''
}
@@ -93,7 +93,7 @@
sh '''
pushd cord/helm-charts
helm dep up xos-core
- helm install -f examples/test-values.yaml -f examples/candidate-tag-values.yaml xos-core -n xos-core
+ helm install -f examples/api-test-values.yaml xos-core -n xos-core
sleep 60
helm status xos-core
popd