(hadoop-release-support) 25/31: Hadoop 3.3.5 RC3 preparation; rollback because 2 staged repos were created

[st...@apache.org]

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

stevel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hadoop-release-support.git

commit a24e2957934eec0e66ce623f73ba605bc800013c
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Wed Mar 15 14:54:49 2023 +0000

    Hadoop 3.3.5 RC3 preparation; rollback because 2 staged repos were created
---
 README.md | 33 ++++++++++++++++++++-------------
 build.xml | 41 +++++++++++++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 1e47d66..79ef8e5 100644
--- a/README.md
+++ b/README.md
@@ -96,12 +96,15 @@ In `build.properties` declare its location
 arm.hadoop.dir=/Users/stevel/hadoop/release/hadoop
 ```
 ```bash
-# create the release (slow)
+# create the release.
+# Broken until someone fixes HADOOP-18664. you can't launch create-release --docker from a build file
 ant arm.create.release
 # copy the artifacts to this project's target/ dir, renaming
 ant arm.copy.artifacts
 # sign artifacts then move to the shared RC dir alongside the x86 artifacts
 ant arm.release
+# list dir and verify the sizes are almost the same
+release.dir.check
 ```
 
 
@@ -117,6 +120,13 @@ When committed to subversion it will be uploaded and accessible via a
 https://svn.apache.org URL.
 
 
+This makes it visible to others via the apache svn site, but it
+is not mirrored yet.
+
+When the RC is released, an `svn move` operation can promote it
+directly.
+
+
 *do this after preparing the arm64 binaries*
 
 Final review of the release files
@@ -124,17 +134,12 @@ Final review of the release files
 ant release.dir.check
 ```
 
-Now stage
+Now stage the files, first by copying the dir of release artifacts
+into the svn-mananaged location
 ```bash
 ant stage
 ```
 
-This makes it visible to others via the apache svn site, but it
-is not mirrored yet.
-
-When the RC is released, an `svn move` operation can promote it
-directly.
-
 ### In the staging svn repo, update, add and commit the work
 
 Can take a while...exit any VPN for extra speed.
@@ -153,9 +158,6 @@ svn commit
 ```
 
 
-
-
-
 ### tag the rc and push to github
 
 This isn't automated as it needs to be done in the source tree.
@@ -464,7 +466,7 @@ For some unknown reason the parquet build doesn't seem to cope.
 
 ```
 
-### Rolling back an RC
+# Rolling back an RC
 
 Drop the staged artifacts from nexus
  [https://repository.apache.org/#stagingRepositories](https://repository.apache.org/#stagingRepositories)
@@ -481,8 +483,13 @@ Remove downloaded files and maven artifactgs
 ant clean purge-from-maven
 ```
 
-Removing staged tar files is not yet automated:
 
 1. Go to the svn staging dir
 2. `svn rm` the RC subdir
 3. `svn commit -m "rollback RC"`
+
+```bash
+ant stage-svn-rollback
+# and get the log
+ant stage-svn-log
+```
diff --git a/build.xml b/build.xml
index 12af262..b4dbae6 100644
--- a/build.xml
+++ b/build.xml
@@ -346,7 +346,7 @@
       <arg value="${staged.artifacts.dir}"/>
     </x>
     <echo>
-      Now go to the staging dir ${staging.dir} and add/commit the files.
+      Now go run the stage-to-svn target and go and have a coffee/close JIRAs.
     </echo>
   </target>
 
@@ -369,7 +369,37 @@
       <arg value="-m" />
       <arg value="${staging.commit.msg}" />
     </svn>
+  </target>
+
+
+  <target name="stage-svn-rollback"
+    description="rollback a version staged to RC"
+    depends="init">
+    <fail unless="jira.id"/>
+    <fail unless="git.commit.id"/>
 
+    <svn dir="${staging.dir}">
+      <arg value="update" />
+    </svn>
+    <svn dir="${staging.dir}">
+      <arg value="rm" />
+      <arg value="${staged.artifacts.dir}" />
+    </svn>
+    <echo>Comitting with message ${staging.commit.msg}. Please wait</echo>
+    <svn dir="${staging.dir}">
+      <arg value="commit" />
+      <arg value="-m" />
+      <arg value="rolling back ${staging.commit.msg}" />
+    </svn>
+  </target>
+
+  <target name="stage-svn-log"
+    description="print the staging svn repo log"
+    depends="init">
+
+    <svn dir="${staging.dir}">
+      <arg value="log" />
+    </svn>
   </target>
 
   <target name="print-tag-command"
@@ -389,6 +419,9 @@
       # how to push to apache
       git push apache ${tag.name}
 
+      # if needed, how to delete locally
+      git tag -d ${tag.name}
+
       # if needed, how to delete it from apache
       git push --delete apache ${tag.name}
     </echo>
@@ -991,11 +1024,7 @@ Message is in file ${message.out}
   -->
   <target name="arm.create.release" depends="init"
       description="create an arm native distro -no asf staging">
-    <delete dir="${arm.dir}" />
-    <mkdir dir="${arm.dir}" />
-    <echo>source artifact is ${arm.binary.src}</echo>
-    <copy file="${arm.binary.src}" tofile="${arm.binary}" />
-   <!-- <copy file="${arm.binary.src}.asc" tofile="${arm.binary.asc}" />-->
+    <echo>Creating ARM release in ${arm.hadoop.dir} </echo>
     <x executable="time" dir="${arm.hadoop.dir}">
       <arg value="dev-support/bin/create-release"/>
       <arg value="--docker"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org