OPENDEV: Add new projects, update rebase.sh job

- openstack/os-traits
- openstack/os-resource-classes

Change-Id: Ia65db71e89802cb517654cb4d9233c604d6669c4
diff --git a/jjb/opendev/rebase-jobs.sh b/jjb/opendev/rebase-jobs.sh
index b223f90..90b84c2 100755
--- a/jjb/opendev/rebase-jobs.sh
+++ b/jjb/opendev/rebase-jobs.sh
@@ -4,6 +4,11 @@
 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 @@
 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