OPENDEV: The openstack-dev/sandbox project renamed to opendev/sandbox in upstream
Change-Id: I2079fe81f7cfc0cddb0c81cb59bdbb9906458080
diff --git a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml b/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
similarity index 84%
copy from jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml
copy to jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
index 107e681..8862f06 100644
--- a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml
+++ b/jjb/opendev/opendev-sandbox/opendev-sandbox-push-upstream-jobs.yml
@@ -18,12 +18,12 @@
# ============LICENSE_END=========================================================
#
- project:
- name: openstack-dev-sandbox-rebase
- project: openstack-dev/sandbox
- project-name: openstack-dev-sandbox
+ name: opendev-sandbox-push-upstream
+ project: opendev/sandbox
+ project-name: opendev-sandbox
stream:
- master:
branch: '{stream}'
jobs:
- - 'opendev-{project-name}-{stream}-rebase'
+ - 'opendev-{project-name}-{stream}-push-upstream'
diff --git a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml b/jjb/opendev/opendev-sandbox/opendev-sandbox-rebase-jobs.yml
similarity index 89%
rename from jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml
rename to jjb/opendev/opendev-sandbox/opendev-sandbox-rebase-jobs.yml
index 107e681..71f1fd6 100644
--- a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-rebase-jobs.yml
+++ b/jjb/opendev/opendev-sandbox/opendev-sandbox-rebase-jobs.yml
@@ -18,9 +18,9 @@
# ============LICENSE_END=========================================================
#
- project:
- name: openstack-dev-sandbox-rebase
- project: openstack-dev/sandbox
- project-name: openstack-dev-sandbox
+ name: opendev-sandbox-rebase
+ project: opendev/sandbox
+ project-name: opendev-sandbox
stream:
- master:
branch: '{stream}'
diff --git a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-push-upstream-jobs.yml b/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-push-upstream-jobs.yml
deleted file mode 100644
index 96273ba..0000000
--- a/jjb/opendev/openstack-dev-sandbox/openstack-dev-sandbox-push-upstream-jobs.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# ============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-dev-sandbox-push-upstream
- project: openstack-dev/sandbox
- project-name: openstack-dev-sandbox
- stream:
- - master:
- branch: '{stream}'
- builders:
- - shell:
- !include-raw-escape: ./test-push-upstream-jobs.sh
-
- jobs:
- - 'opendev-{project-name}-{stream}-push-upstream'
diff --git a/jjb/opendev/openstack-dev-sandbox/test-push-upstream-jobs.sh b/jjb/opendev/openstack-dev-sandbox/test-push-upstream-jobs.sh
deleted file mode 100755
index 8b54682..0000000
--- a/jjb/opendev/openstack-dev-sandbox/test-push-upstream-jobs.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# ============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
-#
-# 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 script will take the single commit form the given Nordix Gerrit review
-# and push it, and all its ancestor commit till $GERRIT_BRANCH, to OpenDev
-# Gerrit.
-# Pre-requisites for script to run successfully:
-# - The Gerrit username in Nordix needs to match with the Gerrit username in
-# OpenDev
-# - infra public key on build server needs to be added to your users SSH
-# Public Keys in OpenDev Gerrit
-#
-set -euxo pipefail
-
-cd "$WORKSPACE"
-
-opendev_gerrit_base='review.opendev.org:29418'
-nordix_gerrit_rest='https://gerrit.nordix.org'
-
-echo >&2 "Collecting information about what and how to push towards OpenDev"
-
-# The git hash of the commit in the review this job runs on
-commit_hash="$GERRIT_PATCHSET_REVISION"
-
-# GERRIT_PROJECT is in the form of opendev/<opendev-project>
-opendev_project=$(echo "$GERRIT_PROJECT" | cut -d/ -f2- )
-
-# Nordix Gerrit can map the email address of the user pushed the change to
-# the review to the Gerrit username of the accound in Nordix Gerrit. This
-# should match with the Gerrit username in the OpenDev Gerrit.
-# TODO(gibi): parse the json propely if there are tools (e.g. jq) available on
-# the jenkins slave
-username=$(
- curl -s -H 'Accept: application/json' \
- "$nordix_gerrit_rest/accounts/?q=email:$GERRIT_EVENT_ACCOUNT_EMAIL&o=DETAILS" \
- | tee /dev/stderr \
- | sed -n 's/^.*"username":"\(\S*\)".*$/\1/p')
-
-opendev_remote_url="ssh://$username@$opendev_gerrit_base/$opendev_project"
-
-# 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
-refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
-
-echo >&2 "Pushing to OpenDev"
-git push "$opendev_remote_url" "$refspec"