From 6dc35dd2bbc021db159802c3f2ee76fe61d34b9a Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Wed, 19 Jun 2019 13:41:02 +0100 Subject: [PATCH] OPENDEV: Add new projects, update rebase.sh job - openstack/os-traits - openstack/os-resource-classes Change-Id: Ia65db71e89802cb517654cb4d9233c604d6669c4 --- ...os-resource-classes-push-upstream-jobs.yml | 26 +++++++++++++++++++ ...nstack-os-resource-classes-rebase-jobs.yml | 26 +++++++++++++++++++ ...openstack-os-traits-push-upstream-jobs.yml | 26 +++++++++++++++++++ .../openstack-os-traits-rebase-jobs.yml | 26 +++++++++++++++++++ jjb/opendev/rebase-jobs.sh | 10 +++---- 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml create mode 100644 jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml create mode 100644 jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml create mode 100644 jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml diff --git a/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml new file mode 100644 index 00000000..2fa20d2b --- /dev/null +++ b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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-os-resource-classes-push-upstream + project: openstack/os-resource-classes + project-name: openstack-os-resource-classes + + jobs: + - 'opendev-{project-name}-push-upstream' \ No newline at end of file diff --git a/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml new file mode 100644 index 00000000..41fc9c9d --- /dev/null +++ b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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-os-resource-classes-rebase + project: openstack/os-resource-classes + project-name: openstack-os-resource-classes + + jobs: + - 'opendev-{project-name}-rebase' \ No newline at end of file diff --git a/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml b/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml new file mode 100644 index 00000000..96ea9d35 --- /dev/null +++ b/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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-os-traits-push-upstream + project: openstack/os-traits + project-name: openstack-os-traits + + jobs: + - 'opendev-{project-name}-push-upstream' \ No newline at end of file diff --git a/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml b/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml new file mode 100644 index 00000000..3b59ed86 --- /dev/null +++ b/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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-os-traits-rebase + project: openstack/os-traits + project-name: openstack-os-traits + + jobs: + - 'opendev-{project-name}-rebase' \ No newline at end of file diff --git a/jjb/opendev/rebase-jobs.sh b/jjb/opendev/rebase-jobs.sh index b223f90d..90b84c22 100755 --- a/jjb/opendev/rebase-jobs.sh +++ b/jjb/opendev/rebase-jobs.sh @@ -4,6 +4,11 @@ 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. @@ -33,8 +38,3 @@ done echo "-- Pushing changes to Nordix Gerrit --" git push nordix --all -v echo "--------------------------------------------------------------------" -# Make sure the Nordix is set from Jenkins Job configuration -# parameter: NORDIX_REMOTE in next job run -if git remote | grep nordix > /dev/null ; then - git remote rm nordix -fi -- 2.25.1