From 14807e746d8009d1e26de3bfb53cb6f0c5c315ac Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 12:36:13 +0000 Subject: [PATCH 01/34] PR TEST Signed-off-by: Andrew Leonard --- sbin/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/build.sh b/sbin/build.sh index 14c8ffbac..bcd8e4b06 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -24,6 +24,7 @@ # Calls 'configure' then 'make' in order to build OpenJDK # ################################################################################ +# TEST! set -eu From c24077644c20c30d7ad344812c6cf5359e1f012b Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 13:26:48 +0000 Subject: [PATCH 02/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11a7ffd93..c68908277 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: image: adoptopenjdk/centos7_build_image steps: # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - name: Build Linux run: ./build-farm/make-adopt-build-farm.sh From 5cad5f4dcdd67299b4421399b2ebd660d4b2d1b7 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 15:09:27 +0000 Subject: [PATCH 03/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c68908277..018f46a99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: image: adoptopenjdk/centos7_build_image steps: # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 - name: Build Linux run: ./build-farm/make-adopt-build-farm.sh From 7098cb618bd713162b436cdd61d6ce5d195fba83 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 15:37:32 +0000 Subject: [PATCH 04/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 018f46a99..f4f6a6b52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ concurrency: jobs: build_linux: name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' container: @@ -81,7 +81,7 @@ jobs: image: adoptopenjdk/centos7_build_image steps: # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Build Linux run: ./build-farm/make-adopt-build-farm.sh From 83fecfd193d862c08917d31cfb5dc4235edc6212 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 15:44:32 +0000 Subject: [PATCH 05/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4f6a6b52..fd6f67498 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ concurrency: jobs: build_linux: name: Linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' container: @@ -81,7 +81,7 @@ jobs: image: adoptopenjdk/centos7_build_image steps: # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@v4 - name: Build Linux run: ./build-farm/make-adopt-build-farm.sh From 0b11d43ecd1461b3a44f2779595016b8824df67c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 15:50:56 +0000 Subject: [PATCH 06/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd6f67498..35d070565 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,6 @@ jobs: build_linux: name: Linux runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' container: image: ${{ matrix.image }} strategy: From ac4af6eb98307a43700ee9d836e5f97a839e1576 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 16:04:59 +0000 Subject: [PATCH 07/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35d070565..4e9435665 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,8 @@ jobs: build_linux: name: Linux runs-on: ubuntu-latest - container: - image: ${{ matrix.image }} + #container: + # image: ${{ matrix.image }} strategy: fail-fast: false matrix: @@ -82,17 +82,27 @@ jobs: - uses: actions/checkout@v4 - name: Build Linux - run: ./build-farm/make-adopt-build-farm.sh - env: - JAVA_TO_BUILD: ${{ matrix.version }} - ARCHITECTURE: x64 - VARIANT: ${{ matrix.variant }} - TARGET_OS: ${{ matrix.os }} - FILENAME: OpenJDK.tar.gz - # Don't set the OS as we use both linux and alpine-linux - PLATFORM_CONFIG_LOCATION: adoptium/temurin-build/master/build-farm/platform-specific-configurations - BUILD_ARGS: --create-sbom - CONFIGURE_ARGS: --with-native-debug-symbols=none + run: docker run --rm -w /home/jenkins -v $PWD:/home/jenkins \ + -e "JAVA_TO_BUILD=${{ matrix.version }}" \ + -e "ARCHITECTURE=x64" \ + -e "VARIANT=${{ matrix.variant }}" \ + -e "TARGET_OS=${{ matrix.os }}" \ + -e "FILENAME=OpenJDK.tar.gz" \ + -e "PLATFORM_CONFIG_LOCATION=adoptium/temurin-build/master/build-farm/platform-specific-configurations" \ + -e "BUILD_ARGS=--create-sbom" \ + -e "CONFIGURE_ARGS=--with-native-debug-symbols=none" \ + ${{ matrix.image }} + ./build-farm/make-adopt-build-farm.sh + #env: + # JAVA_TO_BUILD: ${{ matrix.version }} + # ARCHITECTURE: x64 + # VARIANT: ${{ matrix.variant }} + # TARGET_OS: ${{ matrix.os }} + # FILENAME: OpenJDK.tar.gz + # # Don't set the OS as we use both linux and alpine-linux + # PLATFORM_CONFIG_LOCATION: adoptium/temurin-build/master/build-farm/platform-specific-configurations + # BUILD_ARGS: --create-sbom + # CONFIGURE_ARGS: --with-native-debug-symbols=none # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 From b886cbf35390ea6061530517fbb5b6d2559873e1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 16:08:43 +0000 Subject: [PATCH 08/34] PR TEST Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e9435665..a5f1f803e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,8 @@ jobs: - uses: actions/checkout@v4 - name: Build Linux - run: docker run --rm -w /home/jenkins -v $PWD:/home/jenkins \ + run: | + docker run --rm -w /home/jenkins -v $PWD:/home/jenkins \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ -e "VARIANT=${{ matrix.variant }}" \ @@ -91,7 +92,7 @@ jobs: -e "PLATFORM_CONFIG_LOCATION=adoptium/temurin-build/master/build-farm/platform-specific-configurations" \ -e "BUILD_ARGS=--create-sbom" \ -e "CONFIGURE_ARGS=--with-native-debug-symbols=none" \ - ${{ matrix.image }} + ${{ matrix.image }} \ ./build-farm/make-adopt-build-farm.sh #env: # JAVA_TO_BUILD: ${{ matrix.version }} From 98241dbed59a85154e493db57ca46b22cbf0492c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 16:28:23 +0000 Subject: [PATCH 09/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5f1f803e..9c960343f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,12 +78,11 @@ jobs: variant: bisheng image: adoptopenjdk/centos7_build_image steps: - # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - uses: actions/checkout@v4 - name: Build Linux run: | - docker run --rm -w /home/jenkins -v $PWD:/home/jenkins \ + docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ -e "VARIANT=${{ matrix.variant }}" \ @@ -92,21 +91,10 @@ jobs: -e "PLATFORM_CONFIG_LOCATION=adoptium/temurin-build/master/build-farm/platform-specific-configurations" \ -e "BUILD_ARGS=--create-sbom" \ -e "CONFIGURE_ARGS=--with-native-debug-symbols=none" \ - ${{ matrix.image }} \ + "${{ matrix.image }}" \ ./build-farm/make-adopt-build-farm.sh - #env: - # JAVA_TO_BUILD: ${{ matrix.version }} - # ARCHITECTURE: x64 - # VARIANT: ${{ matrix.variant }} - # TARGET_OS: ${{ matrix.os }} - # FILENAME: OpenJDK.tar.gz - # # Don't set the OS as we use both linux and alpine-linux - # PLATFORM_CONFIG_LOCATION: adoptium/temurin-build/master/build-farm/platform-specific-configurations - # BUILD_ARGS: --create-sbom - # CONFIGURE_ARGS: --with-native-debug-symbols=none - - # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + + - uses: actions/upload-artifact@v4 name: Collect and Archive Artifacts with: name: ${{matrix.version}}-${{matrix.os}}-${{matrix.variant}} @@ -128,8 +116,7 @@ jobs: vendor_testRepos: "${{ github.event.pull_request.head.repo.html_url }}.git" vendor_testBranches: "${{ github.head_ref }}" vendor_testDirs: "/test/functional" - # pinned at v3 to as Node.js 20.x is not supported on Centos 7 - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@v4 name: Collect and Archive SmokeTest Results if: failure() with: From ace61e9d0b5255cf35f583564cfc8ada53dc72c1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 28 Nov 2024 16:30:21 +0000 Subject: [PATCH 10/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c960343f..41b9fb613 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,6 @@ jobs: build_linux: name: Linux runs-on: ubuntu-latest - #container: - # image: ${{ matrix.image }} strategy: fail-fast: false matrix: From e7e19f5519a0b96c7e6bc67e3b2ff41c51d0c990 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 08:40:56 +0000 Subject: [PATCH 11/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41b9fb613..42294b234 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,10 +102,14 @@ jobs: run: | mkdir -p "${HOME}/JDK" tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" + echo "==> ${HOME}/JDK" + ls -l "${HOME}/JDK" - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" + echo "TEST_JDK_HOME=$(dirname "${imageroot}")" + cat "$GITHUB_ENV" - name: Smoke test uses: adoptium/run-aqa@6bacb4e732ad546eda1b09665b9067cdc87651f4 # v2 with: From 2c38758c4a7dfddf60b47f738a510c95d9b9ddd6 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 09:08:36 +0000 Subject: [PATCH 12/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42294b234..e09dd4a0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,6 +109,8 @@ jobs: imageroot=$(find "${HOME}/JDK" -name release -type f) echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" echo "TEST_JDK_HOME=$(dirname "${imageroot}")" + ls -l "${TEST_JDK_HOME}/bin" + "${TEST_JDK_HOME}/bin/java -version" cat "$GITHUB_ENV" - name: Smoke test uses: adoptium/run-aqa@6bacb4e732ad546eda1b09665b9067cdc87651f4 # v2 From 11c682e192d2717439202d74e7c5540b775f045d Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 09:37:20 +0000 Subject: [PATCH 13/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e09dd4a0f..7dea3b5df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,6 +107,7 @@ jobs: - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) + TEST_JDK_HOME=$(dirname "${imageroot}") echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" echo "TEST_JDK_HOME=$(dirname "${imageroot}")" ls -l "${TEST_JDK_HOME}/bin" From 3484ba6cedf0ded2459c50ce2f6a75461574b04f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 10:03:05 +0000 Subject: [PATCH 14/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7dea3b5df..17cf98f94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,6 @@ jobs: echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" echo "TEST_JDK_HOME=$(dirname "${imageroot}")" ls -l "${TEST_JDK_HOME}/bin" - "${TEST_JDK_HOME}/bin/java -version" cat "$GITHUB_ENV" - name: Smoke test uses: adoptium/run-aqa@6bacb4e732ad546eda1b09665b9067cdc87651f4 # v2 From b9bdd4a6d2533ee2b3f68fa376e5c137112e0677 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 10:52:56 +0000 Subject: [PATCH 15/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17cf98f94..70ea7abcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,14 +112,25 @@ jobs: echo "TEST_JDK_HOME=$(dirname "${imageroot}")" ls -l "${TEST_JDK_HOME}/bin" cat "$GITHUB_ENV" - - name: Smoke test - uses: adoptium/run-aqa@6bacb4e732ad546eda1b09665b9067cdc87651f4 # v2 + - name: Checkout aqa-tests repo + uses: actions/checkout@v4 with: - build_list: 'functional/buildAndPackage' - target: '_extended.functional' - vendor_testRepos: "${{ github.event.pull_request.head.repo.html_url }}.git" - vendor_testBranches: "${{ github.head_ref }}" - vendor_testDirs: "/test/functional" + repository: adoptium/aqa-tests + path: aqa-tests + - name: Run Smoke test within the container + run: | + docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ + -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ + -e "BUILD_LIST=functional/buildAndPackage" \ + "${{ matrix.image }}" \ + "cd aqa-tests && \ + ./get.sh --vendor_repos ${{ github.event.pull_request.head.repo.html_url }}.git \ + --vendor_branches ${{ github.head_ref }} \ + --vendor_dirs /test/functional && \ + cd TKG && \ + make compile && \ + make _extended.functional" + - uses: actions/upload-artifact@v4 name: Collect and Archive SmokeTest Results if: failure() From a5d6fb8b5cb732c6964dcb9ef8b4923c7e7723ae Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 11:16:59 +0000 Subject: [PATCH 16/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70ea7abcd..d4c8e3b40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,13 +123,13 @@ jobs: -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ "${{ matrix.image }}" \ - "cd aqa-tests && \ + sh -c 'cd aqa-tests && \ ./get.sh --vendor_repos ${{ github.event.pull_request.head.repo.html_url }}.git \ --vendor_branches ${{ github.head_ref }} \ --vendor_dirs /test/functional && \ cd TKG && \ make compile && \ - make _extended.functional" + make _extended.functional' - uses: actions/upload-artifact@v4 name: Collect and Archive SmokeTest Results From 55cabc5e0fd2214e29d486658777a3fec53592d4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 11:19:09 +0000 Subject: [PATCH 17/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4c8e3b40..efa974ea6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,25 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Checkout aqa-tests repo + uses: actions/checkout@v4 + with: + repository: adoptium/aqa-tests + path: aqa-tests + - name: Run Smoke test within the container + run: | + docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ + -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ + -e "BUILD_LIST=functional/buildAndPackage" \ + "${{ matrix.image }}" \ + sh -c 'cd aqa-tests && \ + ./get.sh --vendor_repos ${{ github.event.pull_request.head.repo.html_url }}.git \ + --vendor_branches ${{ github.head_ref }} \ + --vendor_dirs /test/functional && \ + cd TKG && \ + make compile && \ + make _extended.functional' + - name: Build Linux run: | docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ From 62f4d84fb9ffea1018cfa39ec1288f8230632990 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 11:23:45 +0000 Subject: [PATCH 18/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efa974ea6..eebc00578 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,26 +78,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Checkout aqa-tests repo - uses: actions/checkout@v4 - with: - repository: adoptium/aqa-tests - path: aqa-tests - - name: Run Smoke test within the container - run: | - docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ - -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ - -e "BUILD_LIST=functional/buildAndPackage" \ - "${{ matrix.image }}" \ - sh -c 'cd aqa-tests && \ - ./get.sh --vendor_repos ${{ github.event.pull_request.head.repo.html_url }}.git \ - --vendor_branches ${{ github.head_ref }} \ - --vendor_dirs /test/functional && \ - cd TKG && \ - make compile && \ - make _extended.functional' - - - name: Build Linux + - name: Build Linux within container image "${{ matrix.image }}" run: | docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ @@ -121,22 +102,17 @@ jobs: run: | mkdir -p "${HOME}/JDK" tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" - echo "==> ${HOME}/JDK" - ls -l "${HOME}/JDK" - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) - TEST_JDK_HOME=$(dirname "${imageroot}") echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" - echo "TEST_JDK_HOME=$(dirname "${imageroot}")" - ls -l "${TEST_JDK_HOME}/bin" - cat "$GITHUB_ENV" + - name: Checkout aqa-tests repo uses: actions/checkout@v4 with: repository: adoptium/aqa-tests path: aqa-tests - - name: Run Smoke test within the container + - name: Run Smoke test within container image "${{ matrix.image }}" run: | docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ From fc245840fbbc8e47f9a9745d2d0a4e91f4aa0ed4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 11:36:16 +0000 Subject: [PATCH 19/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eebc00578..80afa98c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,13 +114,15 @@ jobs: path: aqa-tests - name: Run Smoke test within container image "${{ matrix.image }}" run: | + VENDOR_REPOS="${{ github.event.pull_request.head.repo.html_url }}.git" + VENDOR_BRANCH="${{ github.head_ref }}" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ "${{ matrix.image }}" \ sh -c 'cd aqa-tests && \ - ./get.sh --vendor_repos ${{ github.event.pull_request.head.repo.html_url }}.git \ - --vendor_branches ${{ github.head_ref }} \ + ./get.sh --vendor_repos "${VENDOR_REPOS}" \ + --vendor_branches "${VENDOR_BRANCH}" \ --vendor_dirs /test/functional && \ cd TKG && \ make compile && \ From c25ee995c11a00d4cd201ae359ef45487541b2a7 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 13:52:23 +0000 Subject: [PATCH 20/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 80afa98c4..26122a534 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,8 @@ jobs: - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) - echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV" + # TEST_JDK_HOME needs to be mapped to the docker container /home/jenkins mapping + echo "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" - name: Checkout aqa-tests repo uses: actions/checkout@v4 @@ -113,20 +114,21 @@ jobs: repository: adoptium/aqa-tests path: aqa-tests - name: Run Smoke test within container image "${{ matrix.image }}" + env: + VENDOR_REPOS: ${{ github.head_ref }} + VENDOR_BRANCH: ${{ github.event.pull_request.head.repo.html_url }}.git run: | - VENDOR_REPOS="${{ github.event.pull_request.head.repo.html_url }}.git" - VENDOR_BRANCH="${{ github.head_ref }}" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ "${{ matrix.image }}" \ - sh -c 'cd aqa-tests && \ - ./get.sh --vendor_repos "${VENDOR_REPOS}" \ - --vendor_branches "${VENDOR_BRANCH}" \ + sh -c "cd aqa-tests && \ + ./get.sh --vendor_repos ${VENDOR_REPOS} \ + --vendor_branches ${VENDOR_BRANCH} \ --vendor_dirs /test/functional && \ cd TKG && \ make compile && \ - make _extended.functional' + make _extended.functional" - uses: actions/upload-artifact@v4 name: Collect and Archive SmokeTest Results From 27a193da350c4ce5623a9c904734430048c1a7d6 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 14:15:05 +0000 Subject: [PATCH 21/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26122a534..323c35d45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,8 +115,8 @@ jobs: path: aqa-tests - name: Run Smoke test within container image "${{ matrix.image }}" env: - VENDOR_REPOS: ${{ github.head_ref }} - VENDOR_BRANCH: ${{ github.event.pull_request.head.repo.html_url }}.git + VENDOR_REPOS: ${{ github.event.pull_request.head.repo.html_url }}.git + VENDOR_BRANCH: ${{ github.head_ref }} run: | docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ From 99452fdcb0fb53a61e8b15d3d2cd367570702d55 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 14:39:16 +0000 Subject: [PATCH 22/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 323c35d45..1ce84514c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,6 +102,9 @@ jobs: run: | mkdir -p "${HOME}/JDK" tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" + ls -l "${HOME}/JDK" + ls -l "${HOME}/JDK/jdk8u442-b04" + ls -l "${HOME}/JDK/jdk8u442-b04/bin" - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) From 60f4f5ec379df1445bf4a5a439535a87097481aa Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 14:53:15 +0000 Subject: [PATCH 23/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ce84514c..32db80511 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,8 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | + echo "HOME=$HOME" + echo "PWD=$PWD" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ From 620a80f514e69625f665b2a8863be790fa6a56aa Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 14:56:22 +0000 Subject: [PATCH 24/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32db80511..09cf99398 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,8 +80,8 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | - echo "HOME=$HOME" - echo "PWD=$PWD" + echo "HOME=${HOME}" + echo "PWD=${PWD}" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ From 4b88dd2e425ec90b65662f1ca03e8e8b56e21a4f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 14:58:50 +0000 Subject: [PATCH 25/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09cf99398..febf40cc1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,8 +80,9 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | - echo "HOME=${HOME}" echo "PWD=${PWD}" + echo "HOME=${HOME}" + echo "AAA" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ From 949f12fc42fc792322a5e920376588fb4f2701a1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:00:13 +0000 Subject: [PATCH 26/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index febf40cc1..fc03cddf2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,9 +80,9 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | - echo "PWD=${PWD}" + aaa="${PWD}" echo "HOME=${HOME}" - echo "AAA" + echo "AAA=${aaa}" docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ From 5516b83534df9ac15c53b4d5298ce0c8391eb56f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:10:24 +0000 Subject: [PATCH 27/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc03cddf2..13e26d984 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,10 +80,7 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | - aaa="${PWD}" - echo "HOME=${HOME}" - echo "AAA=${aaa}" - docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ + echo docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ -e "VARIANT=${{ matrix.variant }}" \ @@ -105,9 +102,6 @@ jobs: run: | mkdir -p "${HOME}/JDK" tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" - ls -l "${HOME}/JDK" - ls -l "${HOME}/JDK/jdk8u442-b04" - ls -l "${HOME}/JDK/jdk8u442-b04/bin" - name: Set root of jdk image dir run: | imageroot=$(find "${HOME}/JDK" -name release -type f) @@ -124,7 +118,11 @@ jobs: VENDOR_REPOS: ${{ github.event.pull_request.head.repo.html_url }}.git VENDOR_BRANCH: ${{ github.head_ref }} run: | - docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ + aaa="${PWD}" + echo "HOME=${HOME}" + echo "pwd=${aaa}" + ls -l + docker run --rm -w /home/jenkins -v "$HOME":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ "${{ matrix.image }}" \ From f7ae3595d80baffc5e702655f8d407465d9d5452 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:11:47 +0000 Subject: [PATCH 28/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13e26d984..c7b9fae33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,11 +100,11 @@ jobs: - name: Unpack jdk run: | - mkdir -p "${HOME}/JDK" - tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" + echo mkdir -p "${HOME}/JDK" + echo tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" - name: Set root of jdk image dir run: | - imageroot=$(find "${HOME}/JDK" -name release -type f) + echo imageroot=$(find "${HOME}/JDK" -name release -type f) # TEST_JDK_HOME needs to be mapped to the docker container /home/jenkins mapping echo "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" From 8a2094c33b85517d21963875a058fff033b85f99 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:13:09 +0000 Subject: [PATCH 29/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7b9fae33..084ec8e29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,7 @@ jobs: run: | aaa="${PWD}" echo "HOME=${HOME}" - echo "pwd=${aaa}" + echo "AAA=${aaa}" ls -l docker run --rm -w /home/jenkins -v "$HOME":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ From acb4e61886ecc16e780c5ed1241fc71345628635 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:19:11 +0000 Subject: [PATCH 30/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 084ec8e29..0c60af29f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,15 +118,13 @@ jobs: VENDOR_REPOS: ${{ github.event.pull_request.head.repo.html_url }}.git VENDOR_BRANCH: ${{ github.head_ref }} run: | - aaa="${PWD}" - echo "HOME=${HOME}" - echo "AAA=${aaa}" - ls -l + WORK_DIR=$(echo "${PWD}" | sed "s,${HOME},/home/jenkins,") + echo "WORK_DIR=${WORK_DIR}" docker run --rm -w /home/jenkins -v "$HOME":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ "${{ matrix.image }}" \ - sh -c "cd aqa-tests && \ + sh -c "cd ${WORK_DIR}/aqa-tests && \ ./get.sh --vendor_repos ${VENDOR_REPOS} \ --vendor_branches ${VENDOR_BRANCH} \ --vendor_dirs /test/functional && \ From 75234233fbc72f75a1281a4611d38552ffb26dbc Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:24:51 +0000 Subject: [PATCH 31/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c60af29f..da282dca7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: - name: Build Linux within container image "${{ matrix.image }}" run: | - echo docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ + docker run --rm -w /home/jenkins -v "$PWD":"/home/jenkins" \ -e "JAVA_TO_BUILD=${{ matrix.version }}" \ -e "ARCHITECTURE=x64" \ -e "VARIANT=${{ matrix.variant }}" \ @@ -100,13 +100,13 @@ jobs: - name: Unpack jdk run: | - echo mkdir -p "${HOME}/JDK" - echo tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" + mkdir -p "${HOME}/JDK" + tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK" - name: Set root of jdk image dir run: | - echo imageroot=$(find "${HOME}/JDK" -name release -type f) + imageroot=$(find "${HOME}/JDK" -name release -type f) # TEST_JDK_HOME needs to be mapped to the docker container /home/jenkins mapping - echo "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" + "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" - name: Checkout aqa-tests repo uses: actions/checkout@v4 @@ -119,7 +119,6 @@ jobs: VENDOR_BRANCH: ${{ github.head_ref }} run: | WORK_DIR=$(echo "${PWD}" | sed "s,${HOME},/home/jenkins,") - echo "WORK_DIR=${WORK_DIR}" docker run --rm -w /home/jenkins -v "$HOME":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ From 6c646eb6f3ba035bf83cb34b46e7f4a7b6399cce Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:31:28 +0000 Subject: [PATCH 32/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da282dca7..cb4906d20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: VENDOR_REPOS: ${{ github.event.pull_request.head.repo.html_url }}.git VENDOR_BRANCH: ${{ github.head_ref }} run: | - WORK_DIR=$(echo "${PWD}" | sed "s,${HOME},/home/jenkins,") + WORK_DIR="${PWD//${HOME}//home/jenkins}" docker run --rm -w /home/jenkins -v "$HOME":"/home/jenkins" \ -e "TEST_JDK_HOME=${TEST_JDK_HOME}" \ -e "BUILD_LIST=functional/buildAndPackage" \ From c8ebcecd614b38795a315a8c0c5cb2ff896e72d4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 15:47:18 +0000 Subject: [PATCH 33/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb4906d20..b5fb32a3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: run: | imageroot=$(find "${HOME}/JDK" -name release -type f) # TEST_JDK_HOME needs to be mapped to the docker container /home/jenkins mapping - "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" + echo "TEST_JDK_HOME=$(dirname "${imageroot}")" | sed "s,${HOME},/home/jenkins," >> "$GITHUB_ENV" - name: Checkout aqa-tests repo uses: actions/checkout@v4 From 85aaf6e6a11e091bdb12d686ca028f242eab6aa0 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 29 Nov 2024 16:10:13 +0000 Subject: [PATCH 34/34] Fix Node20 error starting docker container Signed-off-by: Andrew Leonard --- sbin/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index bcd8e4b06..14c8ffbac 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -24,7 +24,6 @@ # Calls 'configure' then 'make' in order to build OpenJDK # ################################################################################ -# TEST! set -eu