From: Liam Fallon Date: Tue, 19 Mar 2019 16:28:50 +0000 (+0000) Subject: Merge "Add rebase/push jobs for SDNC/OAM" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=074d95fc3f862ecb007fc68e9693429e3d65677e;hp=1a778fcb929de3f1e37df0d136b679c524e02a91;p=infra%2Fcicd.git Merge "Add rebase/push jobs for SDNC/OAM" --- diff --git a/jjb/cloud-infra/wait-for-pkg-manager.sh b/jjb/cloud-infra/wait-for-pkg-manager.sh index 53eaa096..70c0c0dc 100644 --- a/jjb/cloud-infra/wait-for-pkg-manager.sh +++ b/jjb/cloud-infra/wait-for-pkg-manager.sh @@ -20,7 +20,6 @@ set -o errexit set -o nounset -set -o pipefail source /etc/os-release || source /usr/lib/os-release case ${ID,,} in @@ -39,7 +38,8 @@ echo "Checking for running package manager instance..." while true; do pkg_mgr_process=$(pgrep -f $pkg_mgr_cmd | cat) if [[ -n $pkg_mgr_process ]]; then - echo "Waiting for $pkg_mgr_cmd process $pkg_mgr_process to finish..." + echo "Waiting for $pkg_mgr_cmd processes to finish..." + echo "$pkg_mgr_process" sleep 10 else echo "$pkg_mgr_cmd process done. Continuing..." diff --git a/jjb/dcaegen2/dcaegen2-deployments-push-upstream.yaml b/jjb/dcaegen2/dcaegen2-deployments-push-upstream.yaml new file mode 100644 index 00000000..420544df --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-deployments-push-upstream.yaml @@ -0,0 +1,30 @@ +--- +# ============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========================================================= +# +# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit. +- project: + name: dcaegen2-deployments-push-upstream + project: dcaegen2/deployments + project-name: dcaegen2-deployments + stream: + - master: + branch: '{stream}' + + jobs: + - '{project-name}-{stream}-push-upstream' diff --git a/jjb/dcaegen2/dcaegen2-deployments-rebase-jobs.yaml b/jjb/dcaegen2/dcaegen2-deployments-rebase-jobs.yaml new file mode 100644 index 00000000..25be19af --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-deployments-rebase-jobs.yaml @@ -0,0 +1,35 @@ +--- +# ============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========================================================= +# +# 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: + - '{project-name}-{stream}-rebase' diff --git a/jjb/oom/oom-offline-installer-push-upstream.yaml b/jjb/oom/oom-offline-installer-push-upstream.yaml new file mode 100644 index 00000000..3fcc7827 --- /dev/null +++ b/jjb/oom/oom-offline-installer-push-upstream.yaml @@ -0,0 +1,29 @@ +# ============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========================================================= +# +# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit. +- project: + name: oom-offline-installer-push-upstream + project: oom/offline-installer + project-name: oom-offline-installer + stream: + - master: + branch: '{stream}' + jobs: + - '{project-name}-{stream}-push-upstream' + diff --git a/jjb/oom/oom-offline-installer-rebase.yaml b/jjb/oom/oom-offline-installer-rebase.yaml new file mode 100644 index 00000000..0ea8d362 --- /dev/null +++ b/jjb/oom/oom-offline-installer-rebase.yaml @@ -0,0 +1,30 @@ +# ============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========================================================= +# +# this job gets triggered when a change is merged to +# oom/offline-installer project on ONAP Gerrit. +- project: + name: oom-offline-installer-rebase + project: oom/offline-installer + project-name: oom-offline-installer + stream: + - master: + branch: '{stream}' + jobs: + - '{project-name}-{stream}-rebase' +