engine: Move jobs to cicd project on OpenStack tenant

Change-Id: Ia05d795e0865e66064bae1f58b4248c065942f95

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index 54a7fa870a1a42386901e7dc41c81c0596022875..29842b361c633c1f6e7b339322b6469129d4a9fd 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -65,7 +65,7 @@
 
     cloud:
       - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-cicd'
 
     dependency-jobs: 'engine-verify-package-{distro}-{stream}'
     dependency-job-var: 'TRIGGER_engine_verify_package_{distro}_{stream}_BUILD_RESULT'
@@ -188,16 +188,16 @@
 
     properties:
       - logrotate
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          option: project
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
             - 'engine-verify-online-deploy-test-.*'
             - 'engine-verify-offline-deploy-test-.*'
           block-level: 'NODE'
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          option: project
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
index 8a7f1cdc3fe7a1a1771eb1d855a8fd01eca7290d..dd993c4d622be0f198a7f7ab8776c6730b5ba349 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-package.yaml
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/engine|infra/provisioner/bifrost|infra/provisioner/heat|infra/installer/kolla|infra/installer/kubespray'
           successful: false
@@ -102,10 +102,6 @@
 
     properties:
       - logrotate
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          option: project
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
@@ -114,6 +110,10 @@
             - 'onap-so-periodic-release-offline-.*'
             - 'kubernetes-periodic-release-offline-.*'
           block-level: 'NODE'
+      - throttle:
+          max-per-node: 1
+          max-total: 3
+          option: project
 
     scm:
       - git-scm-gerrit: