Merge "SEBA-650: Update golang to 1.12"
diff --git a/jjb/pipeline/siab-test.groovy b/jjb/pipeline/siab-test.groovy
index 3859454..f2ee19b 100644
--- a/jjb/pipeline/siab-test.groovy
+++ b/jjb/pipeline/siab-test.groovy
@@ -72,7 +72,7 @@
steps {
sh """
pushd $WORKSPACE/cord/automation-tools/seba-in-a-box
- make run-tests ${params.Test_Tags} || true
+ make ${params.Test_Target} ${params.Test_Tags} || true
popd
"""
}
diff --git a/jjb/pipeline/siab.groovy b/jjb/pipeline/siab.groovy
index 2ced48d..ace0b09 100644
--- a/jjb/pipeline/siab.groovy
+++ b/jjb/pipeline/siab.groovy
@@ -53,7 +53,7 @@
steps {
sh """
pushd $WORKSPACE/automation-tools/seba-in-a-box
- make run-tests ${params.Test_Tags} || true
+ make ${params.Test_Target} ${params.Test_Tags} || true
popd
"""
}
diff --git a/jjb/pipeline/xos-service-upgrade.groovy b/jjb/pipeline/xos-service-upgrade.groovy
index 255994c..02edeeb 100644
--- a/jjb/pipeline/xos-service-upgrade.groovy
+++ b/jjb/pipeline/xos-service-upgrade.groovy
@@ -238,6 +238,7 @@
}
}
+ /* Disable the downgrade step because the core doesn't support reverse migrations
stage('Downgrade Service') {
steps {
sh """
@@ -276,6 +277,7 @@
"""
}
}
+ */
}
diff --git a/jjb/siab.yaml b/jjb/siab.yaml
index 6f3fe0f..ec32580 100644
--- a/jjb/siab.yaml
+++ b/jjb/siab.yaml
@@ -42,6 +42,11 @@
description: 'Latest | Stable'
- string:
+ name: Test_Target
+ default: 'run-tests'
+ description: 'run-tests for stable and run-tests-latest for latest'
+
+ - string:
name: Test_Tags
default: ''
description: 'empty for stable and latest for latest'
@@ -87,6 +92,11 @@
description: 'Latest | Stable'
- string:
+ name: Test_Target
+ default: 'run-tests-latest'
+ description: 'run-tests for stable and run-tests-latest for latest'
+
+ - string:
name: Test_Tags
default: ''
description: 'empty for stable and latest for latest'
@@ -144,6 +154,11 @@
description: 'Latest | Stable'
- string:
+ name: Test_Target
+ default: 'run-tests'
+ description: 'run-tests for stable and run-tests-latest for latest'
+
+ - string:
name: Test_Tags
default: 'TESTTAGS=test1'
description: ''