TEMP debug, without build

adoroszlai · Dec 11, 2024 · 63488a0 · 63488a0
1 parent c66b884
commit 63488a0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
       needs-basic-check: false
       needs-native-check: false
       basic-checks: ${{ steps.categorize-basic-checks.outputs.basic-checks }}
-      needs-build: ${{ steps.selective-checks.outputs.needs-build }}
+      needs-build: false
       needs-compile: false
       needs-compose-tests: ${{ steps.selective-checks.outputs.needs-compose-tests }}
       needs-dependency-check: false
@@ -480,7 +480,6 @@ jobs:
   acceptance:
     needs:
       - build-info
-      - build
     runs-on: ubuntu-20.04
     timeout-minutes: 150
     if: needs.build-info.outputs.needs-compose-tests == 'true'
@@ -504,19 +503,18 @@ jobs:
           restore-keys: |
             maven-repo-
       - name: Download compiled Ozone binaries
+        if: needs.build-info.outputs.needs-build == 'true'
         uses: actions/download-artifact@v4
         with:
           name: ozone-bin
       - name: Untar binaries
+        if: needs.build-info.outputs.needs-build == 'true'
         run: |
           mkdir -p hadoop-ozone/dist/target
           tar xzvf ozone*.tar.gz -C hadoop-ozone/dist/target
           rm ozone*.tar.gz
       - name: Execute tests
         run: |
-          pushd hadoop-ozone/dist/target/ozone-*
-          sudo mkdir .aws && sudo chmod 777 .aws && sudo chown 1000 .aws
-          popd
           ./hadoop-ozone/dev-support/checks/acceptance.sh
         env:
           KEEP_IMAGE: false

diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh
@@ -35,10 +35,10 @@ REPORT_FILE="$REPORT_DIR/summary.txt"
 OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout -Dscan=false)
 DIST_DIR="${OZONE_ROOT}/hadoop-ozone/dist/target/ozone-$OZONE_VERSION"
 
-if [ ! -d "$DIST_DIR" ]; then
-    echo "Distribution dir is missing. Doing a full build"
-    "$DIR/build.sh" -Pcoverage
-fi
+#if [ ! -d "$DIST_DIR" ]; then
+#    echo "Distribution dir is missing. Doing a full build"
+#    "$DIR/build.sh" -Pcoverage
+#fi
 
 mkdir -p "$REPORT_DIR"
 
@@ -54,6 +54,14 @@ if [[ "${OZONE_ACCEPTANCE_SUITE}" == "s3a" ]]; then
     echo "Failed to download Hadoop ${HADOOP_VERSION}" > "${REPORT_FILE}"
     exit 1
   fi
+
+  echo $MAVEN_OPTIONS
+  pushd "${HADOOP_AWS_DIR}"
+  mvn $MAVEN_OPTIONS help:effective-pom
+  mvn $MAVEN_OPTIONS help:effective-settings
+  mvn $MAVEN_OPTIONS eu.maveniverse.maven.plugins:toolbox:list-repositories
+  mvn $MAVEN_OPTIONS -N --debug clean
+  exit
 fi
 
 export OZONE_ACCEPTANCE_SUITE OZONE_ACCEPTANCE_TEST_TYPE

diff --git a/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh b/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh
@@ -25,6 +25,14 @@ if [[ -z ${HADOOP_AWS_DIR} ]] || [[ ! -e ${HADOOP_AWS_DIR} ]]; then
 fi
 
 MAVEN_OPTIONS="--fail-never ${MAVEN_OPTIONS:-}"
+echo $MAVEN_OPTIONS
+
+pushd "${HADOOP_AWS_DIR}"
+mvn $MAVEN_OPTIONS help:effective-pom
+mvn $MAVEN_OPTIONS help:effective-settings
+mvn $MAVEN_OPTIONS eu.maveniverse.maven.plugins:toolbox:list-repositories
+mvn $MAVEN_OPTIONS -N --debug clean
+exit
 
 # shellcheck source=/dev/null
 source "$COMPOSE_DIR/../testlib.sh"