Change references of ci.adoptopenjdk.net to ci.adoptium.net (#623)

adoptium · Feb 20, 2023 · c6d6e59 · c6d6e59
1 parent ca0e01a
commit c6d6e59
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 64 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ You can contribute to this project in many different ways.  **We appreciate all
 
 ## Project description
 
-ci-jenkins-pipelines is a project that contains the groovy code that powers our jenkins ci build system.
+ci-jenkins-pipelines is a project that contains the groovy code that powers our jenkins ci build tool.
 
 * <https://github.com/adoptium/ci-jenkins-pipelines>
 
@@ -39,7 +39,7 @@ Contact the Eclipse Foundation Webdev team via [email protected].
 
 Please let us know via our [issue tracker](https://github.com/adoptium/temurin-build/issues) if you find a problem, even if you don't have a fix for it.  The ideal issue report should be descriptive, and where possible include the steps we can take to reproduce the problem for ourselves.
 
-If you have a proposed fix for an issue, or an enhancement you would like to make to the code please describe it in an issue, then send us the code as a [Github pull request](https://help.github.com/articles/about-pull-requests) as described below.
+If you have a proposed fix for an issue, or an enhancement you would like to make to the code please describe it in an issue, then send us the code as a [GitHub pull request](https://help.github.com/articles/about-pull-requests) as described below.
 
 ## Pull requests
 
@@ -56,7 +56,7 @@ Use a descriptive title, and if it relates to an issue in our tracker please ref
 
 ### Pull request comment
 
-The PR comment should be formed by a one-line subject, followed by one line of white space, and one or more descriptive paragraphs, each separated by one line of white space. All of them should be finished by a dot.
+The PR comment should be formed by a one-line subject, followed by one line of whitespace, and one or more descriptive paragraphs, each separated by one line of whitespace. All of them should be finished by a dot.
 
 Where your PR fixes an issue, it should include a reference to the issue's identifier in the first line of the commit comment.  The comment should provide enough information for a reviewer to understand the changes and their relation to the rest of the code.
 
@@ -91,7 +91,7 @@ Finally, for similar reasons to avoiding individual copyright statements, we don
 If you're changing a shell script, please make sure you run `./shellcheck.sh` before submitting your PR. This will also run in a GitHub check titled `Linter / Shellcheck` to ensure you comply to our coding style guidelines.
 
 After we receive your pull request our [GitHub Checks](https://github.com/adoptium/temurin-build/tree/master/.github/workflows) will test your changes.
-If you're making any changes to our groovy files, you'll be more interested in our [pr-tester](https://ci.adoptopenjdk.net/view/build-tester/job/build-scripts-pr-tester/job/openjdk-build-pr-tester/) jenkins job which executes a set of test pipelines in a semi-live environment. Watch for the results posted as a comment to the PR, investigate and fix any failures.
+If you're making any changes to our groovy files, you'll be more interested in our [pr-tester](https://ci.adoptium.net/view/build-tester/job/build-scripts-pr-tester/job/openjdk-build-pr-tester/) jenkins job which executes a set of test pipelines in a semi-live environment. Watch for the results posted as a comment to the PR, investigate and fix any failures.
 Please see the [README.md in prTester/](pipelines/build/prTester/README.md) for more information on any of this.
 
 Fixes can simply be pushed to the same branch from which you opened your pull request. GitHub will automatically re-test when new commits are pushed and update the results.

diff --git a/FAQ.md b/FAQ.md
@@ -81,7 +81,7 @@ For more information on other changes required, see [this document](https://gith
 If you're making changes ensure you follow the contribution guidelines in
 [CONTRIBUTING.md](CONTRIBUTING.md).
 
-In order to test whether your changes work use the [test-build-script-pull-request](https://ci.adoptopenjdk.net/job/build-scripts-pr-tester/job/test-build-script-pull-request/) job!
+In order to test whether your changes work use the [test-build-script-pull-request](https://ci.adoptium.net/job/build-scripts-pr-tester/job/test-build-script-pull-request/) job!
 Pass it your fork name (e.g. `https://github.com/sxa555/openjdk-build`) and the name of the branch and it will run a build using your updated scripts.
 For more information, see the [PR testing documentation](pipelines/build/prTester/README.md).
 

diff --git a/README.md b/README.md
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
@@ -16,7 +16,7 @@ A rough structure of the build is as follows
 
 #### Regenerate Jobs
 
-Jenkins CI jobs are generated by the Jenkins [regeneration pipelines](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/) and placed into the <https://ci.adoptopenjdk.net/job/build-scripts/> location. These builds coordinate the entire process of nightly and release builds.
+Jenkins CI jobs are generated by the Jenkins [regeneration pipelines](https://ci.adoptium.net/job/build-scripts/job/utils/) and placed into the <https://ci.adoptium.net/job/build-scripts/> location. These builds coordinate the entire process of nightly and release builds.
 Documentation for this process can be found at [regeneration docs](https://github.com/adoptium/temurin-build/tree/master/pipelines/build/regeneration)
 
 #### Pipeline Jobs

diff --git a/docs/UsingOurScripts.md b/docs/UsingOurScripts.md
@@ -26,7 +26,7 @@ This file contains the default constants and paths used in the build scripts for
     // Jenkins server details
     "jenkinsDetails"         : {
         // The base URL of the server, usually this is where you would end up if you opened your server from a webpage
-        "rootUrl"            : "https://ci.adoptopenjdk.net",
+        "rootUrl"            : "https://ci.adoptium.net",
         // Jenkins directory where jobs will be generated and run
         "rootDirectory"      : "build-scripts"
     },
@@ -122,7 +122,7 @@ The scripts have been designed with a set hierarchy in mind when choosing which
 
 The `ADOPT JSON` level is only used for files and directories. Other parameters (`JOB_ROOT`, `JENKINS_BUILD_ROOT`, etc) only use the first two levels.
 
-As an example, take a look at the [build-pipeline-generator](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/build-pipeline-generator/) `SCRIPT_FOLDER_PATH` parameter:
+As an example, take a look at the [build-pipeline-generator](https://ci.adoptium.net/job/build-scripts/job/utils/job/build-pipeline-generator/) `SCRIPT_FOLDER_PATH` parameter:
 
 ![Image of the SCRIPT_FOLDER_PATH parameter in jenkins](images/scriptFolderParam.png)
 The script will use whatever has been entered into the parameter field unless it has been left empty, in which case it will use whatever is in the user's `defaults.json['scriptDirectories']['upstream']` attribute.
@@ -149,21 +149,21 @@ Once it has been approved and merged, update your scripts and/or jenkins jobs to
 ## Starting from scratch
 
 1. Create a (preferably) public repository with whatever scripts/configs you have altered. You don't need to place them in the same place as where Adopt's ones are, but they should have the same name. Currently, the list of supported files (replacing `x` with the JDK version number you want to alter, `(u)` is optional) you can modify are:
-    - [pipelines/build/regeneration/build_pipeline_generator.groovy](../pipelines/build/regeneration/build_pipeline_generator.groovy) - Main upstream generator files. This is what the [build-pipeline-generator jenkins job](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/build-pipeline-generator/) executes on build, generating the [upstream jobs](https://ci.adoptopenjdk.net/job/build-scripts/).
-    - [pipelines/jobs/pipeline_job_template.groovy](../pipelines/jobs/pipeline_job_template.groovy) - Upstream jobs dsl. This is the dsl job framework of the [openjdkxx-pipeline downstream jobs](https://ci.adoptopenjdk.net/job/build-scripts).
-    - [pipelines/jobs/weekly_release_pipeline_job_template.groovy](../pipelines/jobs/weekly_release_pipeline_job_template.groovy) - Upstream jobs dsl. This is the dsl job framework of the [weekly-openjdkxx-pipeline downstream jobs](https://ci.adoptopenjdk.net/job/build-scripts).
-    - [pipelines/build/openjdkx_pipeline.groovy](../pipelines/build/openjdk8_pipeline.groovy) - Main upstream script files. These are what the [openjdkx-pipeline jenkins jobs](https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/) execute on build.
+    - [pipelines/build/regeneration/build_pipeline_generator.groovy](../pipelines/build/regeneration/build_pipeline_generator.groovy) - Main upstream generator files. This is what the [build-pipeline-generator jenkins job](https://ci.adoptium.net/job/build-scripts/job/utils/job/build-pipeline-generator/) executes on build, generating the [upstream jobs](https://ci.adoptium.net/job/build-scripts/).
+    - [pipelines/jobs/pipeline_job_template.groovy](../pipelines/jobs/pipeline_job_template.groovy) - Upstream jobs dsl. This is the dsl job framework of the [openjdkxx-pipeline downstream jobs](https://ci.adoptium.net/job/build-scripts).
+    - [pipelines/jobs/weekly_release_pipeline_job_template.groovy](../pipelines/jobs/weekly_release_pipeline_job_template.groovy) - Upstream jobs dsl. This is the dsl job framework of the [weekly-openjdkxx-pipeline downstream jobs](https://ci.adoptium.net/job/build-scripts).
+    - [pipelines/build/openjdkx_pipeline.groovy](../pipelines/build/openjdk8_pipeline.groovy) - Main upstream script files. These are what the [openjdkx-pipeline jenkins jobs](https://ci.adoptium.net/job/build-scripts/job/openjdk8-pipeline/) execute on build.
     - [pipelines/build/common/build_base_file.groovy](../pipelines/build/common/build_base_file.groovy) - Base upstream script file that's called from `pipelines/build/openjdkx_pipeline.groovy`, setting up the [downstream build JSON](../pipelines/library/src/common/IndividualBuildConfig.groovy) for each downstream job and executing them.
     - [pipelines/jobs/configurations/jdkx(u).groovy](../pipelines/jobs/configurations/jdk8u.groovy) - Upstream nightly config files. These define the job schedules, what platforms are instantiated on a nightly build and what tags are used on the weekend releases.
     - [pipelines/jobs/configurations/jdkx(u)_pipeline_config.groovy](../pipelines/jobs/configurations/jdk8u_pipeline_config.groovy) - Downstream build config files, docs for this are [in progress](https://github.com/adoptium/temurin-build/issues/2129).
-    - [pipelines/build/common/kick_off_build.groovy](../pipelines/build/common/kick_off_build.groovy) - Main downstream scripts file. These are what the [jdkx(u)-os-arch-variant jenkins jobs](https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/jdk8u/) execute on build.
+    - [pipelines/build/common/kick_off_build.groovy](../pipelines/build/common/kick_off_build.groovy) - Main downstream scripts file. These are what the [jdkx(u)-os-arch-variant jenkins jobs](https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/) execute on build.
     - [pipelines/build/common/openjdk_build_pipeline.groovy](../pipelines/build/common/openjdk_build_pipeline.groovy) - Base downstream script file. This contains most of the functionality for Adopt's downstream jobs (tests, installers, bash scripts, etc).
     - [pipelines/build/regeneration/jdkx_regeneration_pipeline.groovy](../pipelines/build/regeneration/jdk8_regeneration_pipeline.groovy) - Main downstream generator files.
-    These are what the [pipeline_jobs_generator_jdk8u jenkins jobs](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) execute on build, generating the [downstream jobs](https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/) via `pipelines/build/common/config_regeneration.groovy` (see below).
-    - [pipelines/build/common/config_regeneration.groovy](../pipelines/build/common/config_regeneration.groovy) - Base downstream script file. These are what the [pipeline_jobs_generator_jdk8u jenkins jobs](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) execute after `jdkx_regeneration_pipeline.groovy`, calling the dsl template `pipelines/build/common/create_job_from_template.groovy`.
-    - [pipelines/build/common/create_job_from_template.groovy](../pipelines/build/common/create_job_from_template.groovy) - Downstream jobs dsl. This is the dsl job framework of the [downstream jobs]((https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/)).
+    These are what the [pipeline_jobs_generator_jdk8u jenkins jobs](https://ci.adoptium.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) execute on build, generating the [downstream jobs](https://ci.adoptium.net/job/build-scripts/job/jobs/) via `pipelines/build/common/config_regeneration.groovy` (see below).
+    - [pipelines/build/common/config_regeneration.groovy](../pipelines/build/common/config_regeneration.groovy) - Base downstream script file. These are what the [pipeline_jobs_generator_jdk8u jenkins jobs](https://ci.adoptium.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) execute after `jdkx_regeneration_pipeline.groovy`, calling the dsl template `pipelines/build/common/create_job_from_template.groovy`.
+    - [pipelines/build/common/create_job_from_template.groovy](../pipelines/build/common/create_job_from_template.groovy) - Downstream jobs dsl. This is the dsl job framework of the [downstream jobs](https://ci.adoptium.net/job/build-scripts/job/jobs/).
 2. Create a User JSON file containing your default constants that the build scripts will use (see [#the defaults.json](#defaultsjson))
-3. Copy the [build-pipeline-generator](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/build-pipeline-generator/) and [pipeline_jobs_generator_jdk8u](https://ci.adoptopenjdk.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) jobs to your Jenkins instance (replace `jdk8u` with whichever version you intend to build, there should be one job for each jdk version).
+3. Copy the [build-pipeline-generator](https://ci.adoptium.net/job/build-scripts/job/utils/job/build-pipeline-generator/) and [pipeline_jobs_generator_jdk8u](https://ci.adoptium.net/job/build-scripts/job/utils/job/pipeline_jobs_generator_jdk8u/) jobs to your Jenkins instance (replace `jdk8u` with whichever version you intend to build, there should be one job for each jdk version).
 4. Execute the copied `build-pipeline-generator`. Make sure you have filled in the parameters that are not covered by your `defaults.json` (e.g. `DEFAULTS_URL`, `CHECKOUT_CREDENTIALS`). You should now see that the nightly and weekly pipeline jobs have been successfully created in whatever folder was entered into `JOB_ROOT`
 5. Execute the copied `pipeline_jobs_generator_jdkxx` jobs. Again, make sure you have filled in the parameters that are not covered by your `defaults.json`. You should now see that the `jobs/jdkxx-platform-arch-variant` jobs have been successfully created in whatever folder was entered into `JOB_ROOT`
 

diff --git a/docs/generateBuildMatrix.sh b/docs/generateBuildMatrix.sh
@@ -14,7 +14,7 @@ if [[ -f ${buildFile} ]]; then
 fi
 
 for i in ${allPlatforms[@]}; do
-    curl -s "https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/${i}/" | egrep -o "job/${i}-[^\/]+" >> ${buildJobFile}
+    curl -s "https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/" | egrep -o "job/${i}-[^\/]+" >> ${buildJobFile}
 done
 
 # Filter out jobs matching excludedKeywords
@@ -41,9 +41,9 @@ do
     # buildName should be of the form: aix-ppc64-temurin
     echo -n "| ${buildName} | " >> ${buildFile}
     for i in ${allPlatforms[@]}; do
-        code=$(curl -L -s -o /dev/null -w "%{http_code}" "https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName}")
+        code=$(curl -L -s -o /dev/null -w "%{http_code}" "https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName}")
         if [[ ${code} = 200 ]]; then
-            echo -n "[![Build Status](https://ci.adoptopenjdk.net/buildStatus/icon?job=build-scripts/jobs/${i}/${i}-${buildName})](https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName})" >> "/tmp/build.txt"
+            echo -n "[![Build Status](https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/${i}/${i}-${buildName})](https://ci.adoptium.net/job/build-scripts/job/jobs/job/${i}/job/${i}-${buildName})" >> "/tmp/build.txt"
         else
             echo -n "N/A" >> ${buildFile}
         fi

diff --git a/docs/generateTestMatrix.sh b/docs/generateTestMatrix.sh
@@ -9,7 +9,7 @@ echo "! Platform !! externaltest !! systemtest !! openjdktest !! RELEASE"
 rm "/tmp/build.txt" 2>&1 > /dev/null
 for i in "11";
 do
-    curl -s "https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/jdk${i}/" | egrep -o "job/jdk${i}u?-[^\/]+" >> "/tmp/build.txt"
+    curl -s "https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk${i}/" | egrep -o "job/jdk${i}u?-[^\/]+" >> "/tmp/build.txt"
 done
 
 cat "/tmp/build.txt" | cut -d'/' -f2 | sed -r 's/jdk[0-9]+u?\-//g' | sort | uniq | while read buildName;
@@ -37,21 +37,21 @@ do
     if [ "$type" == "hs" ]; then
 
       echo "|- |"
-      echo "[https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/jdk${i}/job/jdk${i}-${buildName}/ ${buildName}] ||"
+      echo "[https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk${i}/job/jdk${i}-${buildName}/ ${buildName}] ||"
 
       for version in "11";
       do
           for testName in "externaltest"	"systemtest"	"openjdktest";
           do
-            url="https://ci.adoptopenjdk.net/job/openjdk${version}_${type}_${testName}_${arch}_${os}"
+            url="https://ci.adoptium.net/job/openjdk${version}_${type}_${testName}_${arch}_${os}"
             code=$(curl -s -o /dev/null -w "%{http_code}" "${url}")
             if [ $code != 404 ]; then
-                echo "[${url} <img src='https://ci.adoptopenjdk.net/buildStatus/icon?job=openjdk${version}_${type}_${testName}_${arch}_${os}'>] ||"
+                echo "[${url} <img src='https://ci.adoptium.net/buildStatus/icon?job=openjdk${version}_${type}_${testName}_${arch}_${os}'>] ||"
             else
                 echo "N/A ||"
             fi
           done
-          echo "[https://ci.adoptopenjdk.net/job/build-scripts/job/jobs/job/jdk${version}/job/jdk${version}-${buildOs}-${buildArch}-${typeFull}/ <img src='https://ci.adoptopenjdk.net/buildStatus/icon?job=build-scripts/jobs/jdk${version}/jdk${version}-${buildOs}-${buildArch}-${typeFull}'>]"
+          echo "[https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk${version}/job/jdk${version}-${buildOs}-${buildArch}-${typeFull}/ <img src='https://ci.adoptium.net/buildStatus/icon?job=build-scripts/jobs/jdk${version}/jdk${version}-${buildOs}-${buildArch}-${typeFull}'>]"
       done
       echo ""
       echo ""