Support new location for oslo-incubator

oslo-incubator Launchpad project is now (correctly) called oslo-incubator, so we don't need to special-case it anymore. Change-Id: I0834877779f8fa37ea419d1531da5e96734eaec8
2014-08-29 12:13:35 +02:00 · 2014-08-29 12:13:35 +02:00 · a967ea6dab
parent 017acb9902
commit a967ea6dab
4 changed files with 51 additions and 59 deletions
--- a/create_milestones.sample.yaml
+++ b/create_milestones.sample.yaml
@ -1,12 +1,12 @@
 # Name of the series
-series: icehouse
+series: kilo

 # Milestone codes (series- will be prefixed)
 # Value is the release date (or empty string if not set yet)
 milestones:
-   '1': '2013-12-05'
-   '2': '2014-01-23'
-   '3': '2014-03-06'
+   '1': '2014-12-05'
+   '2': '2015-01-23'
+   '3': '2015-03-06'

 # Set of projects to create milestones for
 projects:
@ -16,7 +16,8 @@ projects:
 - horizon
 - neutron
 - cinder
- - oslo
+ - oslo-incubator
 - heat
 - ceilometer
 - trove
+ - sahara
--- a/milestone.sh
+++ b/milestone.sh
@ -29,7 +29,6 @@ fi
 MILESTONE=$1
 SHA=$2
 PROJECT=$3
-LPROJECT="$PROJECT"

 TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

@ -47,13 +46,7 @@ fi
 if [[ "$PROJECT" == "oslo-incubator" ]]; then
  echo "Oslo-incubator mode: skipping tarball generation and upload"
  SKIPTARBALL=1
-  LPROJECT="oslo"
-fi
-
-if [[ "$PROJECT" == "oslo.messaging" ]]; then
-  echo "oslo.messaging mode: skipping tag, tarball generation and upload"
-  SKIPTAG=1
-  SKIPTARBALL=1
+  SKIPUPLOAD=1
 fi

 title "Resolving $MILESTONE to version"
@ -61,39 +54,37 @@ if [[ "$IS_RELEASE" == "1" ]]; then
  VERSION=$MILESTONE
  RELVERSION=$MILESTONE
 else
-  VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $MILESTONE`
+  VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
  RELVERSION=${VERSION:0:6}
 fi
 echo "$MILESTONE is $VERSION (final being $RELVERSION)"

-if [[ "$SKIPTAG" != "1" ]]; then
-  title "Cloning repository for $PROJECT"
-  MYTMPDIR=`mktemp -d`
-  cd $MYTMPDIR
-  git clone git://git.openstack.org/openstack/$PROJECT
-  cd $PROJECT
-  LANG=C git review -s
-  TARGETSHA=`git log -1 $SHA --format='%H'`
-  HEADSHA=`git log -1 HEAD --format='%H'`
+title "Cloning repository for $PROJECT"
+MYTMPDIR=`mktemp -d`
+cd $MYTMPDIR
+git clone git://git.openstack.org/openstack/$PROJECT
+cd $PROJECT
+LANG=C git review -s
+TARGETSHA=`git log -1 $SHA --format='%H'`
+HEADSHA=`git log -1 HEAD --format='%H'`

-  title "Tagging $TARGETSHA as $VERSION"
-  if [[ "$IS_RELEASE" == "1" ]]; then
-    TAGMSG="${PROJECT^} $VERSION release"
-  else
-    TAGMSG="${PROJECT^} $MILESTONE milestone ($VERSION)"
-  fi
-  echo "Tag message is '$TAGMSG'"
-  if [[ "$TARGETSHA" != "$HEADSHA" ]]; then
-    echo "Warning: target SHA does not correspond to HEAD"
-  fi
-  git tag -m "$TAGMSG" -s "$VERSION" $TARGETSHA
-  git push gerrit $VERSION
-  REALSHA=`git show-ref -s --tags "$VERSION"`
-
-  title "Cleaning up"
-  cd ../..
-  rm -rf $MYTMPDIR
+title "Tagging $TARGETSHA as $VERSION"
+if [[ "$IS_RELEASE" == "1" ]]; then
+  TAGMSG="${PROJECT^} $VERSION release"
+else
+  TAGMSG="${PROJECT^} $MILESTONE milestone ($VERSION)"
 fi
+echo "Tag message is '$TAGMSG'"
+if [[ "$TARGETSHA" != "$HEADSHA" ]]; then
+  echo "Warning: target SHA does not correspond to HEAD"
+fi
+git tag -m "$TAGMSG" -s "$VERSION" $TARGETSHA
+git push gerrit $VERSION
+REALSHA=`git show-ref -s --tags "$VERSION"`
+
+title "Cleaning up"
+cd ../..
+rm -rf $MYTMPDIR

 if [[ "$SKIPTARBALL" != "1" ]]; then
  title "Waiting for tarball from $REALSHA"
@ -109,18 +100,18 @@ fi

 if [[ "$SKIPBUGS" != "1" ]]; then
  title "Setting FixCommitted bugs to FixReleased"
-  $TOOLSDIR/process_bugs.py $LPROJECT --settarget=$MILESTONE --fixrelease
+  $TOOLSDIR/process_bugs.py $PROJECT --settarget=$MILESTONE --fixrelease
  read -sn 1 -p "Fix any leftover bugs manually and press key to continue..."
 fi

-if [[ "$SKIPTARBALL" != "1" ]]; then
+if [[ "$SKIPUPLOAD" != "1" ]]; then
  title "Uploading tarball to Launchpad"
  if [[ "$IS_RELEASE" == "1" ]]; then
-    $TOOLSDIR/upload_release.py $LPROJECT $RELVERSION
+    $TOOLSDIR/upload_release.py $PROJECT $RELVERSION
  else
-    $TOOLSDIR/upload_release.py $LPROJECT $RELVERSION --milestone=$MILESTONE
+    $TOOLSDIR/upload_release.py $PROJECT $RELVERSION --milestone=$MILESTONE
  fi
 else
  title "Marking milestone as released in Launchpad"
-  $TOOLSDIR/upload_release.py $LPROJECT $RELVERSION --milestone=$MILESTONE --nop
+  $TOOLSDIR/upload_release.py $PROJECT $RELVERSION --milestone=$MILESTONE --nop
 fi
--- a/rccut.sh
+++ b/rccut.sh
@ -34,7 +34,6 @@ PROJECT=$3
 if [[ "$PROJECT" == "oslo-incubator" ]]; then
  echo "Oslo-incubator mode: skipping tarball check"
  SKIPTARBALL=1
-  PROJECT="oslo"
 fi

 if [[ "$PROJECT" == "swift" ]]; then
--- a/rcdelivery.sh
+++ b/rcdelivery.sh
@ -30,12 +30,11 @@ fi
 SERIES=$1
 RC=$2
 PROJECT=$3
-LPROJECT="$PROJECT"

 if [[ "$PROJECT" == "oslo-incubator" ]]; then
  echo "Oslo-incubator mode: skipping tarball generation and upload"
  SKIPTARBALL=1
-  LPROJECT="oslo"
+  SKIPUPLOAD=1
 fi

 if [[ "$PROJECT" == "swift" ]]; then
@ -54,24 +53,24 @@ function title {
  echo "$(tput bold)$(tput setaf 1)[ $1 ]$(tput sgr0)"
 }

-title "Resolving $LPROJECT $SERIES $RC to version"
+title "Resolving $PROJECT $SERIES $RC to version"

 if [[ "$RC" == "final" ]]; then
-  if [[ "$LPROJECT" != "swift" ]]; then
-    RC1VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $SERIES-rc1`
+  if [[ "$PROJECT" != "swift" ]]; then
+    RC1VERSION=`$TOOLSDIR/ms2version.py $PROJECT $SERIES-rc1`
    FINALVERSION=${RC1VERSION:0:6}
  fi
  MILESTONE=$FINALVERSION
  VERSION=$FINALVERSION
-  $TOOLSDIR/ms2version.py --onlycheck $LPROJECT $MILESTONE
+  $TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
 else
-  if [[ "$LPROJECT" != "swift" ]]; then
+  if [[ "$PROJECT" != "swift" ]]; then
    MILESTONE="$SERIES-$RC"
-    VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $MILESTONE`
+    VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
  else
    MILESTONE="$FINALVERSION-$RC"
    VERSION="$FINALVERSION.$RC"
-    $TOOLSDIR/ms2version.py --onlycheck $LPROJECT $MILESTONE
+    $TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
  fi
 fi
 echo "$SERIES $RC (milestone $MILESTONE) is version $VERSION"
@ -100,19 +99,21 @@ if [[ "$SKIPTARBALL" != "1" ]]; then
  title "Checking tarball is similar to last proposed-$SERIES.tar.gz"
  $TOOLSDIR/similar_tarballs.sh $PROJECT proposed-$SERIES $VERSION
  read -sn 1 -p "Press any key to continue..."
+fi

+if [[ "$SKIPUPLOAD" != "1" ]]; then
  title "Uploading tarball to Launchpad"
  if [[ "$RC" == "final" ]]; then
-    $TOOLSDIR/upload_release.py $LPROJECT $VERSION
+    $TOOLSDIR/upload_release.py $PROJECT $VERSION
  else
-    $TOOLSDIR/upload_release.py $LPROJECT $VERSION --milestone=$MILESTONE
+    $TOOLSDIR/upload_release.py $PROJECT $VERSION --milestone=$MILESTONE
  fi
 else
  title "Marking milestone as released in Launchpad"
  if [[ "$RC" == "final" ]]; then
-    $TOOLSDIR/upload_release.py $LPROJECT $VERSION --nop
+    $TOOLSDIR/upload_release.py $PROJECT $VERSION --nop
  else
-    $TOOLSDIR/upload_release.py $LPROJECT $VERSION --milestone=$MILESTONE --nop
+    $TOOLSDIR/upload_release.py $PROJECT $VERSION --milestone=$MILESTONE --nop
  fi
 fi