[CORD-3171]
Only run legacy jobs on legacy build system repos.
Change-Id: I8fea347a9e14f71ad8e7d095b59029f8efb5a4f9
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 548f033..3c4957f 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -156,10 +156,6 @@
export library=_library.robot
SERVICES=\$(docker exec -i \$CORE_CONTAINER /bin/bash -c "cd /opt/xos/dynamic_services/;find -name '*.xproto'" | awk -F[//] '{print \$2}')
echo \$SERVICES
- export SERVER_IP=\$XOS_CHAMELEON
- export SERVER_PORT=9101
- export XOS_USER=admin@opencord.org
- export XOS_PASSWD=\$(cat $WORKSPACE/cord/build/platform-install/credentials/xosadmin@opencord.org)
cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Properties/
sed -i \"s/^\\(SERVER_IP = \\).*/\\1\'\$XOS_CHAMELEON\'/\" RestApiProperties.py
sed -i \"s/^\\(SERVER_PORT = \\).*/\\1\'9101\'/\" RestApiProperties.py
diff --git a/jjb/verify/cord.yaml b/jjb/verify/cord.yaml
index 7a335ff..4738c0f 100644
--- a/jjb/verify/cord.yaml
+++ b/jjb/verify/cord.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-cord-jobs':
- branch-regexp: '{supported-branches-regexp}'
+ branch-regexp: '{legacy-branches-regexp}'
- job-group:
name: 'verify-cord-jobs'
@@ -19,4 +19,4 @@
dependency-jobs: 'verify_cord_ansible-lint'
- 'api-test':
dependency-jobs: 'verify_cord_sonarqube'
- pipeline_script: 'all-xos-api-test-helm.groovy'
+ pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index 727d95a..9cdce62 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-ecord-jobs':
- branch-regexp: '{supported-branches-regexp}'
+ branch-regexp: '{legacy-branches-regexp}'
- job-group:
name: 'verify-ecord-jobs'
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index 03fc5c9..d32af50 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-exampleservice-jobs':
- branch-regexp: '{supported-branches-regexp}'
+ branch-regexp: '{legacy-branches-regexp}'
- job-group:
name: 'verify-exampleservice-jobs'
diff --git a/jjb/verify/maas.yaml b/jjb/verify/maas.yaml
index 00127de..6c49511 100644
--- a/jjb/verify/maas.yaml
+++ b/jjb/verify/maas.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-maas-jobs':
- branch-regexp: '{supported-branches-regexp}'
+ branch-regexp: '{legacy-branches-regexp}'
- job-group:
name: 'verify-maas-jobs'
diff --git a/jjb/verify/platform-install.yaml b/jjb/verify/platform-install.yaml
index 08c8327..544fe5f 100644
--- a/jjb/verify/platform-install.yaml
+++ b/jjb/verify/platform-install.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-platform-install-jobs':
- branch-regexp: '{supported-branches-regexp}'
+ branch-regexp: '{legacy-branches-regexp}'
- job-group:
name: 'verify-platform-install-jobs'
@@ -19,4 +19,4 @@
dependency-jobs: 'verify_platform-install_ansible-lint'
- 'api-test':
dependency-jobs: 'verify_platform-install_sonarqube'
- pipeline_script: 'all-xos-api-test-helm.groovy'
+ pipeline_script: 'all-xos-api-test.groovy'