Merge "Add defaults for ghprbAuthorRepoGitUrl & ghprbActualCommit."

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index a310159935a99bf439c63b68b57ea31a816f293f..7818e05264268bd168380353fa28e14ba8788476 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -31,7 +31,7 @@
     cloud:
       - city:
           slave-label: 'city-jumphost-ubuntu1804'
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
           daily-trigger: '@midnight'
       - xerces:
           slave-label: 'xerces-jumphost-ubuntu1804'
@@ -112,7 +112,7 @@
 
     disabled: '{obj:disabled}'
 
-    concurrent: true
+    concurrent: false
 
     parameters:
       - project-parameters:
@@ -183,7 +183,7 @@
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
-          max-total: 3
+          max-total: 1
           option: project
 
     wrappers:

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index b6e58970c4cc4ab447f64af697aa039e1a3c0ee3..21c46550880e526aa7c4496b858e7b50b30e1d93 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -80,7 +80,7 @@
       - deploy:
           build-timeout: 90
       - functest:
-          build-timeout: 30
+          build-timeout: 60
 
     jobs:
       - 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index 2bd6c732a10675b8a1ba947b78b728d2279506fb..b3239445c1461a2a9381344a81804cdb2e362fb4 100644 (file)
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -29,6 +29,14 @@ if [[ $DEPLOY_TYPE != "cloud" ]]; then
   exit 0
 fi
 
+# we don't support OpenStack scenario verification on OpenStack yet
+if [[ "$DEPLOY_SCENARIO" =~ "os-" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
+  echo "-------------------------------------------------------------------------"
+  echo "Info: OpenStack scenario verification on OpenStack has not been implemented yet!"
+  echo "-------------------------------------------------------------------------"
+  exit 0
+fi
+
 if [[ "$DELETE_STACK" != "yes" ]]; then
   echo "-------------------------------------------------------------------------"
   echo "Info: Stack will not be deleted upon the completion of the job!"

diff --git a/jjb/global/rebase-jobs.sh b/jjb/global/rebase-jobs.sh
index f124691a73792c6410dc539819eee89c55102ec3..4431bf4863f37973cee9141c5b6e713222a9b640 100644 (file)
--- a/jjb/global/rebase-jobs.sh
+++ b/jjb/global/rebase-jobs.sh
@@ -25,16 +25,18 @@ else
     REMOTE_BRANCHES=${GERRIT_BRANCH}
     git branch -f --track ${GERRIT_BRANCH} origin/${GERRIT_BRANCH}
 fi
-git fetch origin -v
+git fetch origin --tags -v
 echo "-- Adding new remote $NORDIX_REMOTE for sync --"
 git remote add nordix $NORDIX_REMOTE
 git remote -v
 echo "-- Merging changes from Gerrit upstream remote branches to local branch: --"
 for branch in ${REMOTE_BRANCHES}  ; do
-    echo "------ Branch name: ${branch}"
+    echo "--- Branch name: ${branch}"
     git checkout ${branch} -q -f
     git merge origin/${branch} --ff-only --stat
+    echo "------ Pushing changes from branch: ${branch} to Nordix Gerrit"
+    git push nordix -v
+    echo "------ Pushing new tags from branch: ${branch} to Nordix Gerrit"
+    git push nordix --tags -v
 done
-echo "-- Pushing changes to Nordix Gerrit --"
-git push nordix --all -v
 echo "--------------------------------------------------------------------"