Revert debug code from release script (#16379)

* Revert "Do not build haddoop and cat gradle.properties (#16378)" This reverts commit 356c1fa. * Revert "Run publish outside of make-dist.sh (#16377)" This reverts commit 4adab4b.
h2oai · Aug 29, 2024 · 62c1c25 · 62c1c25
1 parent 356c1fa
commit 62c1c25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/make-dist.sh b/make-dist.sh
@@ -77,6 +77,7 @@ fi
 
 # Run some required gradle tasks to produce final build output.
 ./gradlew booklets
+./gradlew $DO_RELEASE publish
 # TODO improve (gradle calls script which then calls gradle, that creates problems with gradle daemon)
 
 # Generate Py Docs

diff --git a/scripts/jenkins/jenkinsfiles/Jenkinsfile-Release b/scripts/jenkins/jenkinsfiles/Jenkinsfile-Release
@@ -84,7 +84,7 @@ try {
                                 # Stop on error.
                                 set -e
 
-                                export BUILD_HADOOP=false
+                                export BUILD_HADOOP=true
                                 export JAVA_HOME=/usr/lib/jvm/java-8-oracle
                                 echo "Activating Python ${env.PYTHON_VERSION}"
                                 . /envs/h2o_env_python${env.PYTHON_VERSION}/bin/activate
@@ -138,11 +138,7 @@ try {
                                     echo "signing.secretKeyRingFile=${RING_FILE_PATH}" >> \$GRADLE_USER_HOME/gradle.properties
                                     chmod -w \$GRADLE_USER_HOME/gradle.properties
                                 fi
-                                cat \$GRADLE_USER_HOME/gradle.properties
                                 ./gradlew build -x test
-                                if [ \$DO_RELEASE ]; then
-                                    ./gradlew -PdoRelease publish
-                                fi
                                 ./gradlew -PvalidateRelease buildH2oDevDist
                             """
                             }