[GR-69288][GR-69311] Some CI job fixes.

PullRequest: graalpython/3981

Author: timfel

.github/workflows/platforms-tests.yml

@@ -36,23 +36,23 @@ jobs:
           mvn -f graalpython/com.oracle.graal.python.test.integration/pom.xml -Dcom.oracle.graal.python.test.polyglot.version=26.0.0 -Dcom.oracle.graal.python.test.polyglot_repo=file:///$(pwd)/m2repo --batch-mode -U -Dtruffle.UseFallbackRuntime=true -Dpolyglot.engine.allowUnsupportedPlatform=true -Dpolyglot.engine.userResourceCache=/$(pwd)/user_resource_cache -Dpolyglot.python.UnsupportedPlatformEmulates=linux -Dorg.graalvm.python.resources.exclude=native.files test -Dtest=HelloWorldTests,AttributeTests,BuiltinSubclassTest,ComplexTexts,CreateClassTest,AsyncActionThreadingTest,JavaInteropTest
           rm -rf $(pwd)/user_resource_cache
 
-      - name: Test on ppc64le
-        uses: uraimo/run-on-arch-action@v3
+      - uses: docker/setup-qemu-action@v3
         with:
-          arch: ppc64le
-          distro: ubuntu_latest
-          dockerRunArgs: |
-            --volume "${GITHUB_WORKSPACE}:/workspace"
-            --memory-reservation 6G
-          run: |
+          platforms: ppc64le
+
+      - uses: docker/setup-docker-action@v4
+
+      - name: Test on ppc64le using Docker
+        run: |
+          docker run --rm --platform=linux/ppc64le -v "${GITHUB_WORKSPACE}:/workspace" -w /workspace ubuntu:24.04 bash -c "
             apt-get update
             apt-get install -y python3 git wget tar gzip cmake build-essential maven openjdk-17-jdk
             export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-ppc64el
-            export PATH=$JAVA_HOME/bin:$PATH
+            export PATH=\$JAVA_HOME/bin:\$PATH
 
-            echo "Using $JAVA_HOME"
-            $JAVA_HOME/bin/java -version
-            cd /workspace
-            mkdir $(pwd)/user_resource_cache
-            mvn -f graalpython/com.oracle.graal.python.test.integration/pom.xml -Dcom.oracle.graal.python.test.polyglot.version=26.0.0 -Dcom.oracle.graal.python.test.polyglot_repo=file:///$(pwd)/m2repo --batch-mode -U -Dtruffle.UseFallbackRuntime=true -Dpolyglot.engine.allowUnsupportedPlatform=true -Dpolyglot.engine.userResourceCache=/$(pwd)/user_resource_cache -Dpolyglot.python.UnsupportedPlatformEmulates=linux -Dorg.graalvm.python.resources.exclude=native.files test -Dtest=HelloWorldTests,AttributeTests,BuiltinSubclassTest,ComplexTexts,CreateClassTest,AsyncActionThreadingTest,JavaInteropTest
-            rm -rf $(pwd)/user_resource_cache
+            echo 'Using \$JAVA_HOME'
+            \$JAVA_HOME/bin/java -version
+            mkdir \$(pwd)/user_resource_cache
+            mvn -f graalpython/com.oracle.graal.python.test.integration/pom.xml -Dcom.oracle.graal.python.test.polyglot.version=26.0.0 -Dcom.oracle.graal.python.test.polyglot_repo=file:///\$(pwd)/m2repo --batch-mode -U -Dtruffle.UseFallbackRuntime=true -Dpolyglot.engine.allowUnsupportedPlatform=true -Dpolyglot.engine.userResourceCache=/\$(pwd)/user_resource_cache -Dpolyglot.python.UnsupportedPlatformEmulates=linux -Dorg.graalvm.python.resources.exclude=native.files test -Dtest=HelloWorldTests,AttributeTests,BuiltinSubclassTest,ComplexTexts,CreateClassTest,AsyncActionThreadingTest,JavaInteropTest
+            rm -rf \$(pwd)/user_resource_cache
+          "

docs/site/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source ENV.fetch("RUBYGEMS_MIRROR", "https://rubygems.org")
 
 gem "jekyll", "~> 4.3.4"
 

mx.graalpython/mx_graalpython.py

@@ -300,7 +300,8 @@ def libpythonvm_build_args():
                     f"graalpy/{commit}",
                     profile,
                 ],
-                nonZeroIsFatal=False
+                nonZeroIsFatal=False,
+                env={"UPLOADER_PYTHON": sys.executable, **os.environ},
             )
         else:
             # Locally, we try to get a reasonable profile
@@ -320,7 +321,7 @@ def libpythonvm_build_args():
                 or ",bench," in os.environ.get("LABELS", "")
         ):
             mx.warn("PGO profile must exist for benchmarking and release, creating one now...")
-            profile = graalpy_native_pgo_build_and_test([])
+            profile = graalpy_native_pgo_build_and_test()
 
     if os.path.isfile(profile or ""):
         print(invert(f"Automatically chose PGO profile {profile}. To disable this, set GRAALPY_PGO_PROFILE to an empty string'", blinking=True), file=sys.stderr)
@@ -335,7 +336,7 @@ def libpythonvm_build_args():
     return build_args
 
 
-def graalpy_native_pgo_build_and_test(_):
+def graalpy_native_pgo_build_and_test(args=None):
     """
     Builds a PGO-instrumented GraalPy native standalone, runs the unittests to generate a profile,
     then builds a PGO-optimized GraalPy native standalone with the collected profile.
@@ -415,18 +416,22 @@ def graalpy_native_pgo_build_and_test(_):
     mx.log(mx.colorize(f"[PGO] Gzipped profile at: {iprof_gz_path}", color="yellow"))
 
     if shutil.which("artifact_uploader"):
-        run([
-            "artifact_uploader",
-            iprof_gz_path,
-            str(SUITE.vc.tip(SUITE.dir)).strip(),
-            "graalpy",
-            "--lifecycle",
-            "cache",
-            "--artifact-repo-key",
-            os.environ.get("ARTIFACT_REPO_KEY_LOCATION"),
-        ])
+        run(
+            [
+                "artifact_uploader",
+                iprof_gz_path,
+                str(SUITE.vc.tip(SUITE.dir)).strip(),
+                "graalpy",
+                "--lifecycle",
+                "cache",
+                "--artifact-repo-key",
+                os.environ.get("ARTIFACT_REPO_KEY_LOCATION"),
+            ],
+            env={"UPLOADER_PYTHON": sys.executable, **os.environ},
+        )
 
-    return iprof_gz_path
+    if args is None:
+        return iprof_gz_path
 
 
 def full_python(args, env=None):
@@ -1124,6 +1129,11 @@ def run_python_unittests(python_binary, args=None, paths=None, exclude=None, env
     if mx.primary_suite() != SUITE:
         env.setdefault("GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS", "true")
 
+    if (pip_index := env.get("PIP_INDEX_URL")) and "PIP_EXTRA_INDEX_URL" not in env:
+        # the user was overriding the index, don't sneak our default extra
+        # index in in that case
+        env["PIP_EXTRA_INDEX_URL"] = pip_index
+
     if BYTECODE_DSL_INTERPRETER:
         args += ['--vm.Dpython.EnableBytecodeDSLInterpreter=true']
     args += [_python_test_runner(), "run", "--durations", "10", "-n", parallelism, f"--subprocess-args={shlex.join(args)}"]