set -o errexit
set -o pipefail
set -o xtrace
+DPKG_LOCK="/var/lib/dpkg/lock-frontend"
+
+# Wait for other apt process to finish by checking the dpkg lock file.
+try=0
+while sudo lsof ${DPKG_LOCK} > /dev/null 2>&1 ; do
+ echo "DPKG file locked: ${DPKG_LOCK}."
+ echo " Waiting for another pkg instalaltion process to finish ..."
+ sleep 10
+ if [[ ${try} -gt 60 ]] ; then
+ echo "ERROR: Max number of re-tries reached, exiting..."
+ exit 1
+ fi
+ try=$((try + 1))
+done
sudo apt-get update
sudo apt-get install -y --no-install-recommends \
--- /dev/null
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd $WORKSPACE
+echo "Info: Cleaning the previous deployment"
+echo "-------------------------------------------------------------------------"
+./stop.sh
+echo "-------------------------------------------------------------------------"
+echo "Info: Deploying the new version of nolabs"
+echo "-------------------------------------------------------------------------"
+./start.sh
+echo "-------------------------------------------------------------------------"
+echo "Info: Deployment successful!"
--- /dev/null
+---
+#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+- project:
+ name: 'nolabs'
+
+ project: 'nolabs'
+
+ stream:
+ - 'master':
+ branch: '{stream}'
+
+ jobs:
+ - 'nolabs-verify-{stream}'
+ - 'nolabs-deploy-{stream}'
+
+- job-template:
+ name: 'nolabs-verify-{stream}'
+
+ concurrent: false
+
+ parameters:
+ - project-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ - nordix-gerrit-parameters
+ - label:
+ name: SLAVE_LABEL
+ default: 'nolabs'
+ description: 'Slave label to schedule this job on.'
+
+ properties:
+ - logrotate
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'nolabs-.*'
+ block-level: 'NODE'
+ - throttle:
+ max-per-node: 1
+ max-total: 1
+ option: project
+
+ wrappers:
+ - build-timeout:
+ timeout: 10
+ - fix-workspace-permissions
+
+ scm:
+ - git-scm-gerrit:
+ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+ branch: '{branch}'
+ refspec: $GERRIT_REFSPEC
+ wipe_workspace: true
+ clean_before: false
+
+ triggers:
+ - gerrit:
+ server-name: 'Nordix Gerrit'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'REG_EXP'
+ project-pattern: 'nolabs'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'false'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: '.gitignore'
+ - compare-type: ANT
+ pattern: '.gitreview'
+
+ builders:
+ - shell:
+ !include-raw-escape: ./verify.sh
+
+- job-template:
+ name: 'nolabs-deploy-{stream}'
+
+ concurrent: false
+
+ parameters:
+ - project-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ - nordix-gerrit-parameters
+ - label:
+ name: SLAVE_LABEL
+ default: 'nolabs'
+ description: 'Slave label to schedule this job on.'
+
+ properties:
+ - logrotate
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'nolabs-.*'
+ block-level: 'NODE'
+ - throttle:
+ max-per-node: 1
+ max-total: 1
+ option: project
+
+ wrappers:
+ - build-timeout:
+ timeout: 10
+ - fix-workspace-permissions
+
+ scm:
+ - git-scm:
+ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+ branch: '{branch}'
+ refspec: ''
+ wipe_workspace: true
+ clean_before: false
+
+ triggers:
+ - gerrit:
+ server-name: 'Nordix Gerrit'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'false'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: '.gitignore'
+ - compare-type: ANT
+ pattern: '.gitreview'
+
+ builders:
+ - shell:
+ !include-raw-escape: ./deploy.sh
+
+# vim: set ts=2 sw=2 expandtab:
--- /dev/null
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd $WORKSPACE
+app=nolabs-verify-${BUILD_ID}
+echo "Info: Building the container image nolabs-verify-${BUILD_ID}"
+echo "-------------------------------------------------------------------------"
+docker build -t $app .
+echo "-------------------------------------------------------------------------"
+echo "Info: Build successful!"
+docker rmi -f $app > /dev/null
name: aai-oom-push-upstream
project: aai/oom
project-name: aai-oom
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: aai/oom
project-name: aai-oom
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: aai-schema-service-push-upstream
project: aai/schema-service
project-name: aai-schema-service
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: aai/schema-service
project-name: aai-schema-service
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: appc-cdt-push-upstream
project: appc/cdt
project-name: appc-cdt
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: appc/cdt
project-name: appc-cdt
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: appc-deployment-push-upstream
project: appc/deployment
project-name: appc-deployment
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: appc/deployment
project-name: appc-deployment
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: appc-parent-push-upstream
project: appc/parent
project-name: appc-parent
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: appc/parent
project-name: appc-parent
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
project: appc
project-name: appc
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: appc-rebase
project: appc
project-name: appc
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
+
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: ccsdk-apps-push-upstream
project: ccsdk/apps
project-name: ccsdk-apps
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: ccsdk/apps
project-name: ccsdk-apps
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: ccsdk-cds-push-upstream
project: ccsdk/cds
project-name: ccsdk-cds
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: ccsdk/cds
project-name: ccsdk-cds
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: ccsdk-platfom-plugins-push-upstream
project: ccsdk/platform/plugins
project-name: ccsdk-platfom-plugins
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: ccsdk-platfom-plugins-rebase
project: ccsdk/platform/plugins
project-name: ccsdk-platfom-plugins
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: onap-ci-management-push-upstream
project: ci-management
project-name: ci-management
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: onap-ci-management-rebase
project: ci-management
project-name: ci-management
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
project: clamp
project-name: clamp
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: clamp-rebase
project: clamp
project-name: clamp
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
+
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
project: dcaegen2/collectors/datafile
project-name: dcaegen2-collectors-datafile
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: dcaegen2/collectors/datafile
project-name: dcaegen2-collectors-datafile
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-collectors-push-upstream
project: dcaegen2/collectors
project-name: dcaegen2-collectors
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
# this job gets triggered when a change is merged to
# dcaegen2/collectors/datafile project on ONAP Gerrit.
- project:
-
name: dcaegen2-collectors-rebase
-
project: dcaegen2/collectors
-
project-name: dcaegen2-collectors
- stream:
- - master:
- branch: '{stream}'
-
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-deployments-push-upstream
project: dcaegen2/deployments
project-name: dcaegen2-deployments
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
# this job gets triggered when a change is merged to
# dcaegen2/deployments project on ONAP Gerrit.
- project:
-
name: dcaegen2-deployments-rebase
-
project: dcaegen2/deployments
-
project-name: dcaegen2-deployments
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-platform-blueprints-push-upstream
project: dcaegen2/platform/blueprints
project-name: dcaegen2-platform-blueprints
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
# this job gets triggered when a change is merged to
# dcaegen2/platform/blueprints project on ONAP Gerrit.
- project:
-
name: dcaegen2-platform-blueprints-rebase
project: dcaegen2/platform/blueprints
project-name: dcaegen2-platform-blueprints
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-platform-plugins-push-upstream
project: dcaegen2/platform/plugins
project-name: dcaegen2-platform-plugins
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: dcaegen2-platform-plugins-rebase
project: dcaegen2/platform/plugins
project-name: dcaegen2-platform-plugins
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
project: dcaegen2/services/pm-mapper
project-name: dcaegen2-services-pm-mapper
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: dcaegen2/services/pm-mapper
project-name: dcaegen2-services-pm-mapper
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-services-prh-push-upstream
project: dcaegen2/services/prh
project-name: dcaegen2-services-prh
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
# this job gets triggered when a change is merged to
# dcaegen2/services/prh project on ONAP Gerrit.
- project:
-
name: dcaegen2-services-prh-rebase
project: dcaegen2/services/prh
project-name: dcaegen2-services-prh
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dcaegen2-push-upstream
project: dcaegen2
project-name: dcaegen2
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: dcaegen2
project-name: dcaegen2
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dmaap-buscontroller-push-upstream
project: dmaap/buscontroller
project-name: dmaap-buscontroller
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: dmaap-buscontroller-rebase
project: dmaap/buscontroller
project-name: dmaap-buscontroller
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dmaap-datarouter-push-upstream
project: dmaap/datarouter
project-name: dmaap-datarouter
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: dmaap-datarouter-rebase
project: dmaap/datarouter
project-name: dmaap-datarouter
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: dmaap-dbcapi-push-upstream
project: dmaap/dbcapi
project-name: dmaap-dbcapi
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: dmaap-dbcapi-rebase
project: dmaap/dbcapi
project-name: dmaap-dbcapi
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: doc-push-upstream
project: doc
project-name: doc
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: doc-rebase
project: doc
project-name: doc
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
- job-template:
- name: 'onap-{project-name}-{stream}-push-upstream'
+ name: 'onap-{project-name}-push-upstream'
- node: onap-ubuntu1604
+ node: infra-ubuntu1804
disabled: false
- logrotate
parameters:
- - project-parameters:
- project: 'onap/{project}'
- branch: '{branch}'
+ - string:
+ name: PROJECT
+ default: 'onap/{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
triggers:
- nordix-gerrit-push-upstream:
project: 'onap/{project}'
- branch: '{branch}'
+ branch: '**'
files: '**'
wrappers:
- job-template:
- name: 'onap-{project-name}-{stream}-rebase'
+ name: 'onap-{project-name}-rebase'
node: infra-ubuntu1804
- logrotate
parameters:
- - project-parameters:
- project: '{project}'
- branch: '{branch}'
- onap-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/onap/{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:
- onap-gerrit-trigger-change-merged:
project: '{project}'
- branch: '{branch}'
+ branch: '**'
files: '**'
- timed: "@midnight"
builders:
- shell:
- !include-raw-escape: ../global/rebase-jobs.sh
+ !include-raw-escape: ./rebase-jobs.sh
publishers:
- notify-slack:
name: integration-csit-push-upstream
project: integration/csit
project-name: integration-csit
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: integration-csit-rebase
project: integration/csit
project-name: integration-csit
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
\ No newline at end of file
+ - 'onap-{project-name}-rebase'
\ No newline at end of file
name: integration-push-upstream
project: integration
project-name: integration
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: integration-rebase
project: integration
project-name: integration
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
\ No newline at end of file
+ - 'onap-{project-name}-rebase'
\ No newline at end of file
name: oom-offline-installer-push-upstream
project: oom/offline-installer
project-name: oom-offline-installer
- stream:
- - master:
- branch: '{stream}'
+
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: oom-offline-installer-rebase
project: oom/offline-installer
project-name: oom-offline-installer
- stream:
- - master:
- branch: '{stream}'
- jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ jobs:
+ - 'onap-{project-name}-rebase'
project: oom
project-name: oom
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - staging:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: oom-rebase
project: oom
project-name: oom
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - staging:
- branch: '{stream}'
+
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-apex-pdp-push-upstream
project: policy/apex-pdp
project-name: policy-apex-pdp
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/apex-pdp
project-name: policy-apex-pdp
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-api-push-upstream
project: policy/api
project-name: policy-api
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/api
project-name: policy-api
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-common-push-upstream
project: policy/common
project-name: policy-common
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/common
project-name: policy-common
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-core-push-upstream
project: policy/core
project-name: policy-core
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/core
project-name: policy-core
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-distribution-push-upstream
project: policy/distribution
project-name: policy-distribution
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/distribution
project-name: policy-distribution
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-docker-push-upstream
project: policy/docker
project-name: policy-docker
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/docker
project-name: policy-docker
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-drools-applications-push-upstream
project: policy/drools-applications
project-name: policy-drools-applications
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/drools-applications
project-name: policy-drools-applications
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-drools-pdp-push-upstream
project: policy/drools-pdp
project-name: policy-drools-pdp
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/drools-pdp
project-name: policy-drools-pdp
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-engine-push-upstream
project: policy/engine
project-name: policy-engine
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/engine
project-name: policy-engine
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-gui-push-upstream
project: policy/gui
project-name: policy-gui
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/gui
project-name: policy-gui
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-models-push-upstream
project: policy/models
project-name: policy-models
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/models
project-name: policy-models
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-oom-push-upstream
project: policy/oom
project-name: policy-oom
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/oom
project-name: policy-oom
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-pap-push-upstream
project: policy/pap
project-name: policy-pap
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/pap
project-name: policy-pap
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-parent-push-upstream
project: policy/parent
project-name: policy-parent
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/parent
project-name: policy-parent
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-pdp-push-upstream
project: policy/pdp
project-name: policy-pdp
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/pdp
project-name: policy-pdp
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: policy-xacml-pdp-push-upstream
project: policy/xacml-pdp
project-name: policy-xacml-pdp
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: policy/xacml-pdp
project-name: policy-xacml-pdp
- stream:
- - master:
- branch: '{stream}'
-# - casablanca:
-# branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: portal-push-upstream
project: portal
project-name: portal
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: portal
project-name: portal
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
#!/bin/bash
-# ============LICENSE_START=======================================================
+# ============LICENSE_START====================================================
# Copyright (C) 2019 The Nordix Foundation. All rights reserved.
-# ================================================================================
+# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
+# ============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 ONAP 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
+# - 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
#
-set -o nounset
-set -o pipefail
+set -euxo pipefail
-cd $WORKSPACE
-echo "Retrieving information from commit to push towards ONAP"
-project=$(git config --local remote.origin.url | awk -F "29418/onap/" '{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
+onap_gerrit_base='gerrit.onap.org:29418'
+echo >&2 "Collecting information about what and how to push towards ONAP"
-echo "Setting user name and email"
-git config user.email $(git show -s --pretty=%ae)
-git config user.name $username
+# The git hash of the commit in the review this job runs on
+commit_hash="$GERRIT_PATCHSET_REVISION"
-echo "Checking out branch on master with new changes"
-git reset HEAD~1 --soft
-git checkout -b delivery_branch origin/$BRANCH
+# GERRIT_PROJECT is in the form of onap/<onap-project>
+onap_project=$(echo "$GERRIT_PROJECT" | cut -d/ -f2- )
+
+# Unfortunately for the some ONAP users, the Nordix Gerrit username don't match
+# the ONAP Gerrit username as the old script use the git author name as
+# the user which will push the change to ONAP Gerrit.
+username=$(git show -s --pretty=%an)
-git config --get remote.upstream.url
-retVal=$?
+onap_remote_url="ssh://$username@$onap_gerrit_base/$onap_project"
-if [[ $retVal -eq 0 ]]
-then
- git remote rm upstream
- git remote add upstream "ssh://$username@gerrit.onap.org:29418/$project.git"
+# 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
- git remote add upstream "ssh://$username@gerrit.onap.org:29418/$project.git"
+ refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
fi
-echo "Committing changes and pushing upstream"
-git commit -as -m "$message"
-git push upstream HEAD:refs/for/$BRANCH
+echo >&2 "Pushing to ONAP"
-retVal1=$?
-if [[ $retVal1 -eq 0 ]]
-then
- echo "Push upstream to ONAP succeeded"
-else
- echo "Push upstream to ONAP failed"
- exit 2
-fi
+# do not fail if git push fails as in case of no new changes we want to succeed. See below.
+set +o pipefail
-git checkout $BRANCH
-git branch -D delivery_branch
+git push "$onap_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
--- /dev/null
+#!/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 ONAP 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 ONAP Gerrit. We will make sure that branch set
+# in GERRIT_BRANCH is in sync with Nordix Gerrit.
+else
+ echo "-- Fetch branch: ${GERRIT_BRANCH} from ONAP 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 ONAP 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 "--------------------------------------------------------------------"
name: sdc-jtosca-push-upstream
project: sdc/jtosca
project-name: sdc-jtosca
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: sdc/jtosca
project-name: sdc-jtosca
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: sdc-push-upstream
project: sdc
project-name: sdc
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: sdc
project-name: sdc
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: sdnc-oam-push-upstream
project: sdnc/oam
project-name: sdnc-oam
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: sdnc-oam-rebase
project: sdnc/oam
project-name: sdnc-oam
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
project: so/docker-config
project-name: so-docker-config
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: so-docker-config-rebase
project: so/docker-config
project-name: so-docker-config
- stream:
- - master:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
\ No newline at end of file
+ - 'onap-{project-name}-rebase'
\ No newline at end of file
project: so
project-name: so
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
name: so-rebase
project: so
project-name: so
- stream:
- - master:
- branch: '{stream}'
- - casablanca:
- branch: '{stream}'
- - dublin:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: testsuite_oom-push-upstream
project: testsuite/oom
project-name: testsuite_oom
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: testsuite/oom
project-name: testsuite_oom
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: testsuite-push-upstream
project: testsuite
project-name: testsuite
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: testsuite
project-name: testsuite
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
name: vid-push-upstream
project: vid
project-name: vid
- stream:
- - master:
- branch: '{stream}'
jobs:
- - 'onap-{project-name}-{stream}-push-upstream'
+ - 'onap-{project-name}-push-upstream'
project: vid
project-name: vid
- stream:
- - master:
- branch: '{stream}'
-
jobs:
- - 'onap-{project-name}-{stream}-rebase'
+ - 'onap-{project-name}-rebase'
--- /dev/null
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+ name: openstack-heat-tempest-plugin-push-upstream
+ project: openstack/heat-tempest-plugin
+ project-name: openstack-heat-tempest-plugin
+
+ jobs:
+ - 'opendev-{project-name}-push-upstream'
\ No newline at end of file
--- /dev/null
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+ name: openstack-heat-tempest-plugin-rebase
+ project: openstack/heat-tempest-plugin
+ project-name: openstack-heat-tempest-plugin
+
+ jobs:
+ - 'opendev-{project-name}-rebase'
\ No newline at end of file
Code Review / infra / cicd.git / commitdiff