diff --git a/buildenv/jenkins/getTRSSOutput b/buildenv/jenkins/getTRSSOutput
index 408972e0cd..3e0363ef56 100644
--- a/buildenv/jenkins/getTRSSOutput
+++ b/buildenv/jenkins/getTRSSOutput
@@ -14,7 +14,7 @@ def getTRSSOutput() {
def TIME_LIMIT = params.TIME_LIMIT ? params.TIME_LIMIT.toInteger() : 30
timeout(time: TIME_LIMIT, unit: 'MINUTES') {
try {
- def TRSS_URL = params.TRSS_URL ? params.TRSS_URL : "https://trss.adoptopenjdk.net/"
+ def TRSS_URL = params.TRSS_URL ? params.TRSS_URL : "https://trss.adoptium.net/"
if (params.JDK_VERSIONS) {
JDK_VERSIONS = JDK_VERSIONS.split(',')
diff --git a/buildenv/jenkins/testJobTemplate b/buildenv/jenkins/testJobTemplate
index d975d42d9c..73f80b8909 100644
--- a/buildenv/jenkins/testJobTemplate
+++ b/buildenv/jenkins/testJobTemplate
@@ -419,7 +419,7 @@ ARCH_OS_LIST.each { ARCH_OS ->
To ensure a balanced workload in test child builds, please also provide TRSS_URL.
If both NUM_MACHINES and TEST_TIME are provided, only NUM_MACHINES will be used.
''')
stringParam('TRSS_URL', TRSS_URL, '''Optional. Active TRSS server to fetch test execution time. Needs to be used with PARALLEL=Dynamic.
- If not provided, the default is https://trss.adoptopenjdk.net
''')
+ If not provided, the default is https://trss.adoptium.net
''')
stringParam('UPSTREAM_TEST_JOB_NAME', "", "Auto-populated. Upstream test job name. It will be used together with PARALLEL=Dynamic")
stringParam('UPSTREAM_TEST_JOB_NUMBER', "", "Auto-populated. Upstream test job number. It will be used together with PARALLEL=Dynamic")
booleanParam('GENERATE_JOBS', GENERATE_JOBS.toBoolean(), "Force generate child jobs?")
diff --git a/external/README.md b/external/README.md
index b7f97caae4..05d1978e44 100644
--- a/external/README.md
+++ b/external/README.md
@@ -39,7 +39,7 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
See the [roadmap](https://github.com/adoptium/aqa-tests/tree/master/external#roadmap) for additional ways we plan to expand this approach.
diff --git a/external/camel/README.md b/external/camel/README.md
index 49beab82bf..9a68809219 100644
--- a/external/camel/README.md
+++ b/external/camel/README.md
@@ -17,5 +17,5 @@ To run any AQA tests locally, you follow the same pattern:
9. `make _camel_test` (When you defined BUILD_LIST to point to a directory in aqa-tests/external, then this is a testCaseName from the playlist.xml file within the directory you chose)
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/derby/README.md b/external/derby/README.md
index 2a7964bf27..2e09c9c006 100644
--- a/external/derby/README.md
+++ b/external/derby/README.md
@@ -18,4 +18,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/elasticsearch/README.md b/external/elasticsearch/README.md
index a5eee50b17..88c35237de 100644
--- a/external/elasticsearch/README.md
+++ b/external/elasticsearch/README.md
@@ -28,4 +28,4 @@ To run AQA tests locally using elasticsearch, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/jacoco/README.md b/external/jacoco/README.md
index 039c243f68..21d72a8ecf 100644
--- a/external/jacoco/README.md
+++ b/external/jacoco/README.md
@@ -19,4 +19,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
\ No newline at end of file
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
\ No newline at end of file
diff --git a/external/kafka/README.md b/external/kafka/README.md
index a713a417b5..b6c185c05d 100644
--- a/external/kafka/README.md
+++ b/external/kafka/README.md
@@ -21,4 +21,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/lucene-solr/README.md b/external/lucene-solr/README.md
index 2adda16635..2dcbc9f994 100644
--- a/external/lucene-solr/README.md
+++ b/external/lucene-solr/README.md
@@ -19,4 +19,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/netty/README.md b/external/netty/README.md
index b2ca261035..d24202131c 100644
--- a/external/netty/README.md
+++ b/external/netty/README.md
@@ -28,4 +28,4 @@ To run AQA tests locally using netty, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/openliberty-mp-tck/README.md b/external/openliberty-mp-tck/README.md
index c82680dd93..558684a0b8 100644
--- a/external/openliberty-mp-tck/README.md
+++ b/external/openliberty-mp-tck/README.md
@@ -18,4 +18,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the openjdk-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/payara-mp-tck/README.md b/external/payara-mp-tck/README.md
index c305e6d7e3..1dad817303 100644
--- a/external/payara-mp-tck/README.md
+++ b/external/payara-mp-tck/README.md
@@ -32,5 +32,5 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/quarkus/README.md b/external/quarkus/README.md
index f92e1bf060..11b8113473 100644
--- a/external/quarkus/README.md
+++ b/external/quarkus/README.md
@@ -19,4 +19,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/quarkus_openshift/README.md b/external/quarkus_openshift/README.md
index 41f2d04b15..97f58084d5 100644
--- a/external/quarkus_openshift/README.md
+++ b/external/quarkus_openshift/README.md
@@ -28,4 +28,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``.
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/quarkus_quickstarts/README.md b/external/quarkus_quickstarts/README.md
index 071dd3d8ac..cd5cdf6b25 100644
--- a/external/quarkus_quickstarts/README.md
+++ b/external/quarkus_quickstarts/README.md
@@ -19,4 +19,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/scala/README.md b/external/scala/README.md
index 0859c7d3d0..e2783d2767 100644
--- a/external/scala/README.md
+++ b/external/scala/README.md
@@ -28,4 +28,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``.
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/spring/README.md b/external/spring/README.md
index e6b21659fd..5c7c1ccb5c 100644
--- a/external/spring/README.md
+++ b/external/spring/README.md
@@ -28,4 +28,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/tomcat/README.md b/external/tomcat/README.md
index 157dbea43e..bcaa1ba168 100644
--- a/external/tomcat/README.md
+++ b/external/tomcat/README.md
@@ -18,4 +18,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/tomee/README.md b/external/tomee/README.md
index 0bd2cec57c..f57e6fef18 100644
--- a/external/tomee/README.md
+++ b/external/tomee/README.md
@@ -20,4 +20,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/wildfly/README.md b/external/wildfly/README.md
index 51a794cf8f..71d3ae250b 100644
--- a/external/wildfly/README.md
+++ b/external/wildfly/README.md
@@ -28,4 +28,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/wycheproof/README.md b/external/wycheproof/README.md
index 71b10e42ee..6233e25731 100644
--- a/external/wycheproof/README.md
+++ b/external/wycheproof/README.md
@@ -28,4 +28,4 @@ To run any AQA tests locally, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/`wycheproof`, and TARGET=`testCaseNameFromPlaylistUnderDirwycheproof`
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).
diff --git a/external/zookeeper/README.md b/external/zookeeper/README.md
index 07c5c582da..29ede94647 100644
--- a/external/zookeeper/README.md
+++ b/external/zookeeper/README.md
@@ -29,5 +29,5 @@ To run AQA tests locally using Zookeeper, you follow the same pattern:
When [running these from the command-line](https://github.com/adoptium/aqa-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the aqa-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=``
-These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView).
+These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptium.net/ThirdPartyAppView).