ACUMOS: Improve jenkins jobs for Acumos projects 56/1456/4
authorrobert.tomczyk <robert.tomczyk@est.tech>
Mon, 24 Jun 2019 08:43:47 +0000 (09:43 +0100)
committerrobert.tomczyk <robert.tomczyk@est.tech>
Mon, 24 Jun 2019 08:53:37 +0000 (09:53 +0100)
- Mirror branches from Acumos upstream project to Nordix.
- Do not force the git user.name to be the gerrit id.
  Git authorship can be independent from the
  gerrit review ownership now.
- Cache the repository on the Jenkins slave nodes
  when rebasing repositories.
- Make sure the commit hash in the local repo is the same
  as in nordix Gerrit and the same as the commit hash
  in the upstream gerrit.
- Decrease number of jobs required for project in Jenkins

Change-Id: I29ea8b9b2573b5d894246f47b537aeb61027f6f8

33 files changed:
jjb/acumos/acumos-java-client/acumos-java-client-push-upstream-jobs.yml
jjb/acumos/acumos-java-client/acumos-java-client-rebase-jobs.yml
jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml
jjb/acumos/face-privacy-filter/face-privacy-filter-push-upstream-jobs.yml
jjb/acumos/face-privacy-filter/face-privacy-filter-rebase-jobs.yml
jjb/acumos/federation/federation-push-upstream-jobs.yml
jjb/acumos/federation/federation-rebase-jobs.yml
jjb/acumos/federation/federation-verify-jobs.yml
jjb/acumos/global-templates-acumos-java.yaml
jjb/acumos/global-templates-acumos-push-upstream.yaml
jjb/acumos/global-templates-acumos-rebase.yaml
jjb/acumos/kubernetes-client/kubernetes-client-push-upstream-jobs.yml
jjb/acumos/kubernetes-client/kubernetes-client-rebase-jobs.yml
jjb/acumos/kubernetes-client/kubernetes-client-verify-jobs.yaml
jjb/acumos/license-manager/license-manager-push-upstream-jobs.yml
jjb/acumos/license-manager/license-manager-rebase-jobs.yml
jjb/acumos/license-manager/license-manager-verify-jobs.yaml
jjb/acumos/microservice-generation/microservice-generation-push-upstream-jobs.yml
jjb/acumos/microservice-generation/microservice-generation-rebase-jobs.yml
jjb/acumos/microservice-generation/microservice-generation-verify-jobs.yaml
jjb/acumos/portal-marketplace/portal-marketplace-push-upstream-jobs.yml
jjb/acumos/portal-marketplace/portal-marketplace-rebase-jobs.yml
jjb/acumos/portal-marketplace/portal-marketplace-verify-jobs.yaml
jjb/acumos/push-upstream-jobs.sh
jjb/acumos/rebase-jobs.sh [new file with mode: 0755]
jjb/acumos/runtime-orchestrator/runtime-orchestrator-push-upstream-jobs.yml
jjb/acumos/runtime-orchestrator/runtime-orchestrator-rebase-jobs.yml
jjb/acumos/runtime-orchestrator/runtime-orchestrator-verify-jobs.yaml
jjb/acumos/security-verification/security-verification-push-upstream-jobs.yaml
jjb/acumos/security-verification/security-verification-rebase-jobs.yaml
jjb/acumos/security-verification/security-verification-verify-jobs.yaml
jjb/acumos/system-integration/system-integration-push-upstream-jobs.yml
jjb/acumos/system-integration/system-integration-rebase-jobs.yml

index 36b9c03dacd4bdcdbb53e42d2b8d59d22e03fb72..297cfaea57c6075c5adf363907981cac44c69e2a 100644 (file)
@@ -21,9 +21,6 @@
     name: acumos-java-client-push-upstream
     project: acumos-java-client
     project-name: acumos-java-client
-    stream:
-      - master:
-          branch: '{stream}'
 
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index a297e489a698bc5c0699007cb89f43ff49e87aea..c0eefe3a287df74874d5294a3a45a0d09f2a7776 100644 (file)
@@ -21,9 +21,6 @@
     name: acumos-java-client-rebase
     project: acumos-java-client
     project-name: acumos-java-client
-    stream:
-      - master:
-          branch: '{stream}'
 
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index b2b23cedc43df8f400c89be3fa383dfcaafc2481..1cd317df623dcf9926829d246aef0976fac8ae56 100644 (file)
@@ -21,9 +21,6 @@
     name: acumos-java-client-verify
     project: acumos-java-client
     project-name: acumos-java-client
-    stream:
-      - master:
-          branch: '{stream}'
 
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 49d02e13476601eb62247746d06f79859a65f42d..fcabea58130ef7f8469b653072f9ad4a637436bb 100644 (file)
@@ -21,9 +21,6 @@
     name: face-privacy-filter-push-upstream
     project: face-privacy-filter
     project-name: face-privacy-filter
-    stream:
-      - master:
-          branch: '{stream}'
 
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 7bca15c9d516f5956636750cee9a35c102cd9e60..601cccac03b611fef8c6ab44a43274d166685986 100644 (file)
@@ -21,9 +21,6 @@
     name: face-privacy-filter-rebase
     project: face-privacy-filter
     project-name: face-privacy-filter
-    stream:
-      - master:
-          branch: '{stream}'
 
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index 494c0778bba4c078bd04d1107845c7b5c5e5843e..acdb9ed00c1716ee930afdb6782cee29cac804d1 100644 (file)
@@ -22,9 +22,5 @@
     project: federation
     project-name: federation
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 7748dc26741064577b60923396deb41ce5fd05cd..845064a42666df45b3709bce21c69e3829bbd3a7 100644 (file)
@@ -21,8 +21,6 @@
     name: federation-rebase
     project: federation
     project-name: federation
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index cfd4e999b3c76d6697a12d1b161d3d7cd2fca567..74c7af05dfabc29f33b7d6b9561e815b56370ffc 100644 (file)
@@ -22,9 +22,5 @@
     project: federation
     project-name: federation
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 707f3983632ea3b88cceb99577953ab77d73bdda..2ea9d53c379ff9f6f67cb3102ae702cb1bc7e3d9 100644 (file)
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-verify-java'
+    name: 'acumos-{project-name}-verify-java'
 
     node: acumos-ubuntu1604
 
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'acumos/{project}'
-          branch: '{branch}'
       - nordix-gerrit-parameters
+      - string:
+          name: PROJECT
+          default: 'acumos/{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - string:
           name: JAVA_HOME
           default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
@@ -35,7 +36,7 @@
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
+          branch: $GERRIT_BRANCH
           refspec: $GERRIT_REFSPEC
           wipe_workspace: true
           clean_before: false
@@ -43,7 +44,7 @@
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'acumos/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers:
index 2a31aafda168cee2f235197924ac76f503ca2a59..a0cf5b120c7c6fe52b698ccb7ca5fc0d5664f70a 100644 (file)
@@ -1,7 +1,7 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-push-upstream'
+    name: 'acumos-{project-name}-push-upstream'
 
-    node: onap-ubuntu1604
+    node: infra-build01-ubuntu1804
 
     disabled: false
 
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'acumos/{project}'
-          branch: '{branch}'
+      - string:
+          name: PROJECT
+          default: 'acumos/{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - nordix-gerrit-parameters
 
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
+          branch: $GERRIT_BRANCH
           refspec: $GERRIT_REFSPEC
           wipe_workspace: true
           clean_before: false
@@ -27,7 +28,7 @@
     triggers:
       - nordix-gerrit-push-upstream:
           project: 'acumos/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers:
index 994c9236d9a1b306180e511ae74744d989caaed8..1a25eb3f726f190c3374a22e30a5485fbda05b68 100644 (file)
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-rebase'
+    name: 'acumos-{project-name}-rebase'
 
     node: infra-build01-ubuntu1804
 
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
       - acumos-gerrit-parameters
+      - string:
+          name: PROJECT
+          default: '{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - string:
           name: NORDIX_REMOTE
           default: 'ssh://infra@gerrit.nordix.org:29418/acumos/{project}.git'
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: '{branch}'
+          branch: 'master'
           refspec: ''
-          wipe_workspace: true
-          clean_before: false
+          wipe_workspace: false
+          clean_before: true
 
     triggers:
       - acumos-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
@@ -41,8 +42,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/rebase-jobs.sh
+          !include-raw-escape: ./rebase-jobs.sh
 
     publishers:
       - notify-slack:
-          slack-channel: '#acumos'
+          slack-channel: '#infra'
index 7b1cf169754c6fa3682ea7c3b26e18a12f7d5949..3566a4906aed6b380d62daa89491ca622a7c610a 100644 (file)
@@ -22,9 +22,5 @@
     project: kubernetes-client
     project-name: kubernetes-client
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 11c6d10b0e1ca1c283f32a109aefd1f6be6432cd..a98f5c09ed52b642e57e5793190112df1ddbc3dc 100644 (file)
@@ -21,8 +21,6 @@
     name: kubernetes-client-rebase
     project: kubernetes-client
     project-name: kubernetes-client
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index 48c7130401c9a33490d2e963c16fd95a14f92109..4d0708bb2fd1db1c3dc4b2f9dc44d1e270df42d2 100644 (file)
@@ -22,9 +22,5 @@
     project: kubernetes-client
     project-name: kubernetes-client
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index abf1c7b00b87b6440d61c95d3fc51a24a8512d7e..f10472c4a2985ee40af055385cb4ee8b18fdbb7e 100644 (file)
@@ -22,9 +22,5 @@
     project: license-manager
     project-name: license-manager
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index ba0f4bf22e773a6b30826ba0de4e171d7f1cb0c0..89968e3676cead5c9b5578e81e1a9070611f267c 100644 (file)
@@ -21,8 +21,6 @@
     name: license-manager-rebase
     project: license-manager
     project-name: license-manager
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index 1189c4cad9b4a8905e0b8ca3e4e001784f675350..110f4d3f5ec84e511b6ccb9f901b41b2ca4d9893 100644 (file)
@@ -22,9 +22,5 @@
     project: license-manager
     project-name: license-manager
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index ed85e80205a029ef7d00a7162be3bc69399496bf..7357a0e057b36aa4008037ef88189ad2ff9334a3 100644 (file)
@@ -22,9 +22,5 @@
     project: microservice-generation
     project-name: microservice-generation
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 47ee772efd74bc48ff613130bf22adcb22e323ad..1d1e61c971af5c5add31eaf84adbdaeb0e261ee9 100644 (file)
@@ -21,8 +21,6 @@
     name: microservice-generation-rebase
     project: microservice-generation
     project-name: microservice-generation
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index 4b996f04b7fe92405cf33c007201b794bb32922d..c0cc9b7b7937d6478d847da2afa5525921e89143 100644 (file)
@@ -22,9 +22,5 @@
     project: microservice-generation
     project-name: microservice-generation
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 85b1257194012488bb9a0d23df76951719f712e2..f1192873a63505779f9471590caea74d198521ab 100644 (file)
@@ -22,9 +22,5 @@
     project: portal-marketplace
     project-name: portal-marketplace
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 00fffea9e0cb1b378641435b8f46ac3f3c46d1fe..ee384c88970438740eb8f1ed9a673f2b2ceb7fb7 100644 (file)
@@ -21,8 +21,6 @@
     name: portal-marketplace-rebase
     project: portal-marketplace
     project-name: portal-marketplace
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index f48fe83a3199dc7031cb02635e3b8653cfb53cc3..e8c03f59eaff1843ceec9fac60386bd11df46750 100644 (file)
@@ -22,9 +22,5 @@
     project: portal-marketplace
     project-name: portal-marketplace
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 1eded15b5ef5fbeac4a43f6615f266c2da56c981..9354bfbbf1d0bf27d930ed4fb2bf9251a04e73f7 100755 (executable)
 # ============LICENSE_END=========================================================
 
 #
-# This script will take the changes that are pushed to Nordix Gerrit and push upstream to ONAP
+# This script will take the single commit form the given Nordix Gerrit review
+# and push it, and all its ancestor commit till $GERRIT_BRANCH, to Acumos
+# Gerrit.
 # Pre-requisites for script to run successfully:
-# - Author name in Nordix Gerrit equals LFID i.e. need to run "git config --global user.name <LFID>"
-# - infra public key on build server needs to be added to your users SSH Public Keys in ONAP Gerrit
+# - The Gerrit username in Nordix needs to match with the Gerrit username in
+#   Acumos
+# - infra public key on build server needs to be added to your users SSH
+#   Public Keys in Acumos Gerrit
 #
-set -o nounset
-set -o pipefail
+set -euxo pipefail
 
-cd $WORKSPACE
-echo "Retrieving information from commit to push towards Acumos"
-project=$(git config --local remote.origin.url | awk -F "29418/acumos/" '{print $2}')
-message=$(git show -s --pretty=%B | grep -vi 'Signed-off-by')
-username=$(git show -s --pretty=%an)
+cd "$WORKSPACE"
 
-pattern=" "
-if [[ "$username" =~ $pattern ]]
-then
-    echo "Incorrect username, use Linux Foundation ID as git user.name when pushing to Nordix"
-    exit 1
-fi
+acumos_gerrit_base='gerrit.acumos.org:29418'
+nordix_gerrit_rest='https://gerrit.nordix.org'
 
-echo "Setting user name and email"
-git config user.email $(git show -s --pretty=%ae)
-git config user.name $username
+echo >&2 "Collecting information about what and how to push towards Acumos"
 
-echo "Checking out branch on master with new changes"
-git reset HEAD~1 --soft
-git checkout -b delivery_branch origin/$BRANCH
+# The git hash of the commit in the review this job runs on
+commit_hash="$GERRIT_PATCHSET_REVISION"
 
-git config --get remote.upstream.url
-retVal=$?
+# GERRIT_PROJECT is in the form of acumos/<acumos-project>
+acumos_project=$(echo "$GERRIT_PROJECT" | cut -d/ -f2- )
 
-if [[ $retVal -eq 0 ]]
-then
-  git remote rm upstream
-  git remote add upstream "ssh://$username@gerrit.acumos.org:29418/$project.git"
-else
-  git remote add upstream "ssh://$username@gerrit.acumos.org:29418/$project.git"
-fi
+# Nordix Gerrit can map the email address of the user pushed the change to
+# the review to the Gerrit username of the account in Nordix Gerrit. This
+# should match with the Gerrit username in the Acumos Gerrit.
+username=$(
+    curl -s -H 'Accept: application/json' \
+        "$nordix_gerrit_rest/accounts/?q=email:$GERRIT_EVENT_ACCOUNT_EMAIL&o=DETAILS" \
+    | tee /dev/stderr | tail -1 | jq -r '.[0].username')
 
-echo "Committing changes and pushing upstream"
-git commit -as -m "$message"
-git push upstream HEAD:refs/for/$BRANCH
+acumos_remote_url="ssh://$username@$acumos_gerrit_base/$acumos_project"
 
-retVal1=$?
-if [[ $retVal1 -eq 0 ]]
-then
-  echo "Push upstream to Acumos succeeded"
+# GERRIT_BRANCH is the _intended_ branch of the commit under review
+# E.g. git push HEAD:refs/for/master => GERRIT_BRANCH='master'
+# GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
+# is set for the change.
+if [ -z "${GERRIT_TOPIC:-}" ] ; then
+    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
 else
-  echo "Push upstream to Acumos failed"
-  exit 2
+    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
 fi
 
-git checkout $BRANCH
-git branch -D delivery_branch
+echo >&2 "Pushing to Acumos"
+
+# do not fail if git push fails as in case of no new changes we want to succeed. See below.
+set +o pipefail
+
+git push "$acumos_remote_url" "$refspec" 2>&1 | tee push_result.txt
+push_result=${PIPESTATUS[0]}
+
+# make the job a success if the above git push fails due to no new changes are needed
+# to be created upstream. This will be useful when we switch to automatic triggering
+# of the push-upstream for each patch set and jobs on different commits in a same chain
+# will race with each other to push parts of the chain
+if [ $push_result -ne 0 ]; then
+    grep '(no new changes)' push_result.txt
+fi
diff --git a/jjb/acumos/rebase-jobs.sh b/jjb/acumos/rebase-jobs.sh
new file mode 100755 (executable)
index 0000000..41c2aa3
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd $WORKSPACE
+# Make sure the Nordix is set from Jenkins Job configuration
+# parameter: NORDIX_REMOTE and not from previous job execution
+if git remote | grep nordix > /dev/null ; then
+    git remote rm nordix
+fi
+# When the GERRIT_BRANCH is not set the rebase job wasn't triggered by merge
+# but it's executed as part of timer. In this case we will make sure that all
+# branches from remote are synced with Nordix Gerrit.
+if [[ -z "${GERRIT_BRANCH:-}" ]] ; then
+    echo "-- Fetch all branches from Acumos for project: ${PROJECT} --"
+    REMOTE_BRANCHES=$(git branch -r | grep -v 'HEAD -> ' | awk '/origin/ {gsub("origin/","");print}')
+    for branch in ${REMOTE_BRANCHES}  ; do
+        git branch -f --track ${branch} origin/${branch}
+    done
+# The job was triggered by merge on Acumos. We will make sure that branch set
+# in GERRIT_BRANCH is in sync with Nordix Gerrit.
+else
+    echo "-- Fetch branch: ${GERRIT_BRANCH} from Acumos for project: ${PROJECT} --"
+    REMOTE_BRANCHES=${GERRIT_BRANCH}
+    git branch -f --track ${GERRIT_BRANCH} origin/${GERRIT_BRANCH}
+fi
+git fetch origin -v
+echo "-- Adding new remote $NORDIX_REMOTE for sync --"
+git remote add nordix $NORDIX_REMOTE
+git remote -v
+echo "-- Merging changes from Acumos remote branches to local branch: --"
+for branch in ${REMOTE_BRANCHES}  ; do
+    echo "------ Branch name: ${branch}"
+    git checkout ${branch} -q
+    git merge origin/${branch} --ff-only --stat
+done
+echo "-- Pushing changes to Nordix Gerrit --"
+git push nordix --all -v
+echo "--------------------------------------------------------------------"
index f207bcc58553d7e817fd41f91ae2c3a167a28a53..99dfe1f7e30399db830354a78e7bbe20bb63fd53 100644 (file)
@@ -22,9 +22,5 @@
     project: runtime-orchestrator
     project-name: runtime-orchestrator
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 34a4de57dd923c28656252e63317b9b0ec941023..28ef648eb3831b37491130d8400ca0ac928ae350 100644 (file)
@@ -21,8 +21,6 @@
     name: runtime-orchestrator-rebase
     project: runtime-orchestrator
     project-name: runtime-orchestrator
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index e874e5cb5ce302f5a081f885645f7b21d390f6d5..e82ff8812002888b077881ee65b57dbbbb818461 100644 (file)
@@ -22,9 +22,5 @@
     project: runtime-orchestrator
     project-name: runtime-orchestrator
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 4a0193dd04f104072d76f2388e069a348301d85c..8b6a7a64643f3d0be441598a37e3889d599d28a6 100644 (file)
@@ -22,9 +22,5 @@
     project: security-verification
     project-name: security-verification
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index 81aeed866f8cb78d48749f59d6fb9266071de338..900ae0e3e6893834433fc9a08d59be1cd2508c85 100644 (file)
@@ -21,8 +21,6 @@
     name: security-verification-rebase
     project: security-verification
     project-name: security-verification
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'
index 1cf609df28129b5c14d25d99bfb1bdee62e56074..7138d981301942c9b9ec31f3bcfbb5eb97e0f14e 100644 (file)
@@ -22,9 +22,5 @@
     project: security-verification
     project-name: security-verification
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-verify-java'
+      - 'acumos-{project-name}-verify-java'
index 7b45b447c0886bf4b8c639d9a5416f2996995f0f..585ca9d89665f773c38426e3fc5def65c369f493 100644 (file)
@@ -22,9 +22,5 @@
     project: system-integration
     project-name: system-integration
 
-    stream:
-      - master:
-          branch: '{stream}'
-
     jobs:
-      - 'acumos-{project-name}-{stream}-push-upstream'
+      - 'acumos-{project-name}-push-upstream'
index d63fcb211860d9bf760129d295231fe7b5fe4506..28a0845d18f0ed245fadda7401d38771fa7d61b9 100644 (file)
@@ -21,8 +21,6 @@
     name: system-integration-rebase
     project: system-integration
     project-name: system-integration
-    stream:
-      - master:
-          branch: '{stream}'
+
     jobs:
-      - 'acumos-{project-name}-{stream}-rebase'
+      - 'acumos-{project-name}-rebase'