[incubator-daffodil] branch master updated: Add more automation to release candidate container

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git


The following commit(s) were added to refs/heads/master by this push:
     new 46f0cb3  Add more automation to release candidate container
46f0cb3 is described below

commit 46f0cb3cc893fc1961f49a75bd18bb891fc979d4
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jan 2 08:42:06 2020 -0500

    Add more automation to release candidate container
    
    - Install the wix shell script as part of creating the container instead
      of getting it from the cloned daffodil repo. This avoids having a
      broken symlink before the daffodil repo is cloned
    - Change how we clone the svn repo to avoid unneeded directories
    - svn remove any previous release candidates if they exist. Needed for
      when doing an rc2, for example
    - svn add the new release files so they are ready for commit if all
      checks pass
    - Put final steps in a script to automate release after all checks pass
    - Add some missing suppression of popd output
    
    DAFFODIL-2264
---
 containers/release-candidate/Dockerfile            |  3 ++
 .../release-candidate/daffodil-release-candidate   | 40 +++++++++++++---------
 containers/release-candidate/setup-container.sh    |  2 --
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/containers/release-candidate/Dockerfile b/containers/release-candidate/Dockerfile
index 15e9f60..7114fe1 100644
--- a/containers/release-candidate/Dockerfile
+++ b/containers/release-candidate/Dockerfile
@@ -22,6 +22,9 @@ WORKDIR /root
 COPY setup-container.sh /root/
 RUN /root/setup-container.sh
 
+COPY wix_wine.sh /root/wix311/\\bin\\candle.exe
+COPY wix_wine.sh /root/wix311/\\bin\\light.exe
+
 COPY daffodil-release-candidate /root/
 
 ENTRYPOINT ["/root/daffodil-release-candidate"]
diff --git a/containers/release-candidate/daffodil-release-candidate b/containers/release-candidate/daffodil-release-candidate
index 18e8471..3b2df98 100755
--- a/containers/release-candidate/daffodil-release-candidate
+++ b/containers/release-candidate/daffodil-release-candidate
@@ -84,7 +84,7 @@ if [ $? -ne 0 ]; then
    echo -e "\n!!! Ensure you have created a bind mount of your gitconfig file, for example with -v ~/.gitconfig:/root/.gitconfig !!!\n"
    exit
 fi
-popd
+popd &> /dev/null
 rm -rf $TEST_GIT_DIR
 
 if [ ! -d /root/.ssh/ ]; then
@@ -98,11 +98,9 @@ echo
 
 REPO_ROOT=`pwd`
 
-APACHE_DIST_DIR=$REPO_ROOT/apache-dist
-DAFFODIL_DIST_ROOT=$APACHE_DIST_DIR/dev/incubator/daffodil
-
 DAFFODIL_REPO="incubator-daffodil"
 DAFFODIL_SITE_REPO="incubator-daffodil-site"
+DAFFODIL_DIST="incubator-daffodil-dist"
 
 echo "Cloning repos..."
 
@@ -113,12 +111,8 @@ echo
 echo git clone ssh://git@github.com/apache/$DAFFODIL_SITE_REPO.git
 git clone ssh://git@github.com/apache/$DAFFODIL_SITE_REPO.git
 
-svn checkout https://dist.apache.org/repos/dist apache-dist --depth empty
-pushd apache-dist &> /dev/null
-svn update --set-depth empty dev
-svn update --set-depth empty dev/incubator
-svn update --set-depth infinity dev/incubator/daffodil
-popd &> /dev/null
+echo svn checkout https://dist.apache.org/repos/dist/dev/incubator/daffodil $DAFFODIL_DIST
+svn checkout https://dist.apache.org/repos/dist/dev/incubator/daffodil $DAFFODIL_DIST
 
 pushd $REPO_ROOT/$DAFFODIL_REPO &> /dev/null
 
@@ -136,7 +130,8 @@ DAFFODIL_REPO_DIR=$REPO_ROOT/$DAFFODIL_REPO
 DAFFODIL_SITE_DIR=$REPO_ROOT/$DAFFODIL_SITE_REPO
 DAFFODIL_DOCS_DIR=$DAFFODIL_SITE_DIR/site/docs/$VERSION
 DAFFODIL_TUTORIALS_DIR=$DAFFODIL_SITE_DIR/site/tutorials
-DAFFODIL_RELEASE_DIR=$DAFFODIL_DIST_ROOT/$VERSION-$PRE_RELEASE
+DAFFODIL_DIST_DIR=$REPO_ROOT/$DAFFODIL_DIST
+DAFFODIL_RELEASE_DIR=$DAFFODIL_DIST_DIR/$VERSION-$PRE_RELEASE
 
 if [ -d "$DAFFODIL_RELEASE_DIR" ]; then echo -e "\n!!! Daffodil release directory already exists: $DAFFODIL_RELEASE_DIR !!! "; exit; fi
 
@@ -170,6 +165,8 @@ sbt \
   "daffodil-japi/genjavadoc:doc" \
   "daffodil-sapi/doc" \
 
+echo "Removing old release candidates..."
+find $DAFFODIL_DIST_DIR -maxdepth 1 -name $VERSION-\* -exec svn delete --force {} \;
 
 echo "Installing Source and Convenience Binaries..."
 mkdir -p $DAFFODIL_RELEASE_DIR/{src,bin}/
@@ -191,7 +188,7 @@ do
        sha512sum --binary $file > $file.sha512
        gpg --default-key $PGP_SIGNING_KEY_ID --detach-sign --armor --output $file.asc $file
     done
-    popd > /dev/null
+    popd &> /dev/null
 done
 
 echo "Installing Site Docs..."
@@ -216,6 +213,9 @@ git add .
 git commit -m "Stage release v$VERSION-$PRE_RELEASE"
 popd &> /dev/null
 
+echo "Adding Release Files..."
+svn add $DAFFODIL_RELEASE_DIR
+
 echo
 echo
 echo
@@ -224,7 +224,7 @@ echo "!!! Success: $VERSION-$PRE_RELEASE output to $DAFFODIL_RELEASE_DIR !!!"
 echo
 echo "Things to verify: "
 echo
-echo "- Files in $DAFFODIL_RELEASE_DIR"
+echo "- Files in $DAFFODIL_DIST_DIR"
 echo "- Files in $DAFFODIL_DOCS_DIR"
 echo "- Files in $DAFFODIL_TUTORIALS_DIR"
 echo "- Git tag created in $DAFFODIL_REPO_DIR for v$VERSION-$PRE_RELEASE"
@@ -236,11 +236,19 @@ if [ "$DRY_RUN" = true ]; then
   echo
   echo "Type 'exit' when done with the container"
 else
+
+  cat << EOF > /root/complete-release
+#!/bin/bash
+set -x
+cd $DAFFODIL_DIST_DIR && svn ci --username $APACHE_USERNAME -m 'Staging Apache Daffodil (incubating) $VERSION-$PRE_RELEASE'
+cd $DAFFODIL_REPO_DIR && git push origin v$VERSION-$PRE_RELEASE
+cd $DAFFODIL_SITE_DIR && git push origin master
+EOF
+  chmod +x /root/complete-release
+
   echo "If everything looks correct, do the following:"
   echo
-  echo "- Run: cd $APACHE_DIST_DIR && svn ci -m 'Staging Apache Daffodil (incubating) $VERSION-$PRE_RELEASE'"
-  echo "- Run: cd $DAFFODIL_REPO_DIR && git push origin v$VERSION-$PRE_RELEASE"
-  echo "- Run: cd $DAFFODIL_SITE_DIR && git push origin master"
+  echo "- Run: /root/complete-release"
   echo "- Close the staged files at https://repository.apache.org"
   echo "- Type 'exit' and  start a VOTE!"
   echo
diff --git a/containers/release-candidate/setup-container.sh b/containers/release-candidate/setup-container.sh
index adee5d3..2b6a26b 100755
--- a/containers/release-candidate/setup-container.sh
+++ b/containers/release-candidate/setup-container.sh
@@ -31,8 +31,6 @@ curl -L https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-b
 mkdir wix311
 unzip wix311-binaries.zip -d wix311/
 rm wix311-binaries.zip
-ln -s $BUILD_DIR/incubator-daffodil/scripts/wix_wine.sh $BUILD_DIR/wix311/\\bin\\candle.exe
-ln -s $BUILD_DIR/incubator-daffodil/scripts/wix_wine.sh $BUILD_DIR/wix311/\\bin\\light.exe
 
 # enable sbt pgp
 mkdir -p /root/.sbt/1.0/plugins/