You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/04/01 22:28:36 UTC
[trafficserver-ci] branch main updated: controller.trafficserver.org -> ci.trafficserver.apache.org (#93)
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new ac1786b controller.trafficserver.org -> ci.trafficserver.apache.org (#93)
ac1786b is described below
commit ac1786be2e0b73bfad8987f3f47e059f73d6bb78
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Fri Apr 1 17:28:31 2022 -0500
controller.trafficserver.org -> ci.trafficserver.apache.org (#93)
ci.trafficserver.apache.org is the correct URL to use and it has the
correct externally facing cert as served by our controller's ATS. This
updates our scripts to use the ci.trafficserver.apache.org URL so that
people copying the image name from jenkins console output will be able
to use that locally if they so desire.
---
docker/cache-tests/Dockerfile | 2 +-
docker/cache-tests/README.md | 6 +++---
jenkins/branch/autest.pipeline | 4 ++--
jenkins/branch/cache-tests.pipeline | 4 ++--
jenkins/branch/clang_analyzer.pipeline | 4 ++--
jenkins/branch/clang_format.pipeline | 4 ++--
jenkins/branch/coverage.pipeline | 4 ++--
jenkins/branch/docs.pipeline | 4 ++--
jenkins/branch/in_tree.pipeline | 4 ++--
jenkins/branch/os_build.pipeline | 4 ++--
jenkins/branch/out_of_tree.pipeline | 4 ++--
jenkins/branch/rat.pipeline | 4 ++--
jenkins/fedora.pipeline | 4 ++--
jenkins/github/autest.pipeline | 4 ++--
jenkins/github/centos.pipeline | 4 ++--
jenkins/github/clang-analyzer.pipeline | 4 ++--
jenkins/github/clang-format-test.pipeline | 4 ++--
jenkins/github/clang-format.pipeline | 4 ++--
jenkins/github/debian.pipeline | 4 ++--
jenkins/github/docs.pipeline | 4 ++--
jenkins/github/fedora.pipeline | 2 +-
jenkins/github/rat.pipeline | 4 ++--
jenkins/github/rocky.pipeline | 4 ++--
jenkins/github/ubuntu-clang.pipeline | 4 ++--
jenkins/github/ubuntu.pipeline | 4 ++--
jenkins/ubuntu-param.pipeline | 4 ++--
jenkins/ubuntu.pipeline | 4 ++--
27 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/docker/cache-tests/Dockerfile b/docker/cache-tests/Dockerfile
index 67fbcfb..34c1d7f 100644
--- a/docker/cache-tests/Dockerfile
+++ b/docker/cache-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM controller.trafficserver.org/ats/debian:11
+FROM ci.trafficserver.apache.org/ats/debian:11
EXPOSE 8000
diff --git a/docker/cache-tests/README.md b/docker/cache-tests/README.md
index cc37373..51aee0b 100644
--- a/docker/cache-tests/README.md
+++ b/docker/cache-tests/README.md
@@ -13,7 +13,7 @@ For this to work a desired clone of the cache-tests git repo
needs to reside in /opt/cache-tests/cache-tests on the `controller`.
Periodically this git repo should be updated which will require rebuilding
-the cache-tests image: `controller.trafficserver.org/ats/cache-tests`
+the cache-tests image: `ci.trafficserver.apache.org/ats/cache-tests`
and restarting the Publishing server.
Currently the `debian:11` image from the ats docker repo is used
@@ -45,8 +45,8 @@ git stash ; git fetch ; git pull ; git stash apply
# rebuild and push cache-tests image
cd /opt/cache-tests
docker-compose build builder
-docker tag <hash> controller.trafficserver.org:5000/ats/cache-tests
-docker push controller.trafficserver.org:5000/ats/cache-tests
+docker tag <hash> ci.trafficserver.apache.org:5000/ats/cache-tests
+docker push ci.trafficserver.apache.org:5000/ats/cache-tests
docker-compose up -d server
```
diff --git a/jenkins/branch/autest.pipeline b/jenkins/branch/autest.pipeline
index 720557f..00d73a4 100644
--- a/jenkins/branch/autest.pipeline
+++ b/jenkins/branch/autest.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
args '--init --cap-add=SYS_PTRACE --network=host -v ${HOME}/ccache:/tmp/ccache:rw'
label 'branch'
}
diff --git a/jenkins/branch/cache-tests.pipeline b/jenkins/branch/cache-tests.pipeline
index 671acf3..11793f5 100644
--- a/jenkins/branch/cache-tests.pipeline
+++ b/jenkins/branch/cache-tests.pipeline
@@ -10,8 +10,8 @@ pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/cache-tests'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/cache-tests'
args '--user root --init --cap-add=SYS_PTRACE --network=host -v ${HOME}/ccache:/tmp/ccache:rw'
label 'branch'
}
diff --git a/jenkins/branch/clang_analyzer.pipeline b/jenkins/branch/clang_analyzer.pipeline
index f80a257..93883db 100644
--- a/jenkins/branch/clang_analyzer.pipeline
+++ b/jenkins/branch/clang_analyzer.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/ubuntu:20.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/ubuntu:20.04'
args '-v /home/jenkins/clang-analyzer:/tmp/clang-analyzer:rw --network=host'
label 'branch'
}
diff --git a/jenkins/branch/clang_format.pipeline b/jenkins/branch/clang_format.pipeline
index ac646f2..e4ac10b 100644
--- a/jenkins/branch/clang_format.pipeline
+++ b/jenkins/branch/clang_format.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
label 'branch'
args '--network=host'
}
diff --git a/jenkins/branch/coverage.pipeline b/jenkins/branch/coverage.pipeline
index 55eced2..d7edfa9 100644
--- a/jenkins/branch/coverage.pipeline
+++ b/jenkins/branch/coverage.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
args '--init --cap-add=SYS_PTRACE --network=host -v ${HOME}/ccache:/tmp/ccache:rw'
label 'branch'
}
diff --git a/jenkins/branch/docs.pipeline b/jenkins/branch/docs.pipeline
index 070af73..f922473 100644
--- a/jenkins/branch/docs.pipeline
+++ b/jenkins/branch/docs.pipeline
@@ -5,8 +5,8 @@ pipeline {
stage('Build') {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
args '--network=host'
label 'branch'
}
diff --git a/jenkins/branch/in_tree.pipeline b/jenkins/branch/in_tree.pipeline
index 7ee1342..36de751 100644
--- a/jenkins/branch/in_tree.pipeline
+++ b/jenkins/branch/in_tree.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
args '--network=host -v "${HOME}"/ccache:/tmp/ccache:rw'
label 'branch'
}
diff --git a/jenkins/branch/os_build.pipeline b/jenkins/branch/os_build.pipeline
index fce93da..71cf9ca 100644
--- a/jenkins/branch/os_build.pipeline
+++ b/jenkins/branch/os_build.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/' + env.DISTRO
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/' + env.DISTRO
args '-v /home/jenkins/ccache:/tmp/ccache:rw --network=host'
label 'branch'
}
diff --git a/jenkins/branch/out_of_tree.pipeline b/jenkins/branch/out_of_tree.pipeline
index 15e7f7e..7c5970e 100644
--- a/jenkins/branch/out_of_tree.pipeline
+++ b/jenkins/branch/out_of_tree.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
args '--network=host -v "${HOME}"/ccache:/tmp/ccache:rw'
label 'branch'
}
diff --git a/jenkins/branch/rat.pipeline b/jenkins/branch/rat.pipeline
index dca8bb8..f3204f7 100644
--- a/jenkins/branch/rat.pipeline
+++ b/jenkins/branch/rat.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- registryUrl 'https://controller.trafficserver.org/'
- image 'controller.trafficserver.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
label 'branch'
// We need host networking for clang-format to download
args '--network=host'
diff --git a/jenkins/fedora.pipeline b/jenkins/fedora.pipeline
index 96e6d62..50cf7c2 100644
--- a/jenkins/fedora.pipeline
+++ b/jenkins/fedora.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/old_ci/fedora:30'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/old_ci/fedora:30'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
}
}
diff --git a/jenkins/github/autest.pipeline b/jenkins/github/autest.pipeline
index 25b234c..9987b87 100644
--- a/jenkins/github/autest.pipeline
+++ b/jenkins/github/autest.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
args '--init --cap-add=SYS_PTRACE --network=host -v ${HOME}/ccache:/tmp/ccache:rw'
label 'docker'
}
diff --git a/jenkins/github/centos.pipeline b/jenkins/github/centos.pipeline
index 4160248..ceac025 100644
--- a/jenkins/github/centos.pipeline
+++ b/jenkins/github/centos.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/centos:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/centos:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
args '-v ${HOME}/ccache:/tmp/ccache:rw'
}
diff --git a/jenkins/github/clang-analyzer.pipeline b/jenkins/github/clang-analyzer.pipeline
index 8121dad..5a95e5f 100644
--- a/jenkins/github/clang-analyzer.pipeline
+++ b/jenkins/github/clang-analyzer.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/ubuntu:20.04'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/ubuntu:20.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
args '-v /home/rooter/clang-analyzer:/tmp/clang-analyzer:rw'
label 'docker'
}
diff --git a/jenkins/github/clang-format-test.pipeline b/jenkins/github/clang-format-test.pipeline
index 15f1297..94940d3 100644
--- a/jenkins/github/clang-format-test.pipeline
+++ b/jenkins/github/clang-format-test.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
// We need host networking for clang-format to download
args '--network host'
diff --git a/jenkins/github/clang-format.pipeline b/jenkins/github/clang-format.pipeline
index 0da33e0..6a1c1b3 100644
--- a/jenkins/github/clang-format.pipeline
+++ b/jenkins/github/clang-format.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
// We need host networking for clang-format to download
args '--network host'
diff --git a/jenkins/github/debian.pipeline b/jenkins/github/debian.pipeline
index 114aa66..dbe24e2 100644
--- a/jenkins/github/debian.pipeline
+++ b/jenkins/github/debian.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/debian:10'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/debian:10'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
args '-v ${HOME}/ccache:/tmp/ccache:rw'
}
diff --git a/jenkins/github/docs.pipeline b/jenkins/github/docs.pipeline
index e2b59c3..e13c035 100644
--- a/jenkins/github/docs.pipeline
+++ b/jenkins/github/docs.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
args '--network=host'
label 'docker'
}
diff --git a/jenkins/github/fedora.pipeline b/jenkins/github/fedora.pipeline
index 4ded83f..fd35e4e 100644
--- a/jenkins/github/fedora.pipeline
+++ b/jenkins/github/fedora.pipeline
@@ -2,7 +2,7 @@ pipeline {
agent {
docker {
image 'ats/fedora:35'
- //registryUrl 'https://controller.trafficserver.org/'
+ //registryUrl 'https://ci.trafficserver.apache.org/'
args '-v ${HOME}/ccache:/tmp/ccache:rw'
label 'linux'
}
diff --git a/jenkins/github/rat.pipeline b/jenkins/github/rat.pipeline
index bac8e0a..d4b9834 100644
--- a/jenkins/github/rat.pipeline
+++ b/jenkins/github/rat.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
// We need host networking for clang-format to download
args '--network host'
diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline
index 363619d..365f04f 100644
--- a/jenkins/github/rocky.pipeline
+++ b/jenkins/github/rocky.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/rockylinux:8'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/rockylinux:8'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
args '-v ${HOME}/ccache:/tmp/ccache:rw'
}
diff --git a/jenkins/github/ubuntu-clang.pipeline b/jenkins/github/ubuntu-clang.pipeline
index 2e36503..51186c4 100644
--- a/jenkins/github/ubuntu-clang.pipeline
+++ b/jenkins/github/ubuntu-clang.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/ubuntu:20.04'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/ubuntu:20.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
}
}
diff --git a/jenkins/github/ubuntu.pipeline b/jenkins/github/ubuntu.pipeline
index c4bff3d..2646513 100644
--- a/jenkins/github/ubuntu.pipeline
+++ b/jenkins/github/ubuntu.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/ubuntu:20.04'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/ubuntu:20.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
args '-v ${HOME}/ccache:/tmp/ccache:rw'
}
diff --git a/jenkins/ubuntu-param.pipeline b/jenkins/ubuntu-param.pipeline
index 29b8c7f..2f167fe 100644
--- a/jenkins/ubuntu-param.pipeline
+++ b/jenkins/ubuntu-param.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/old_ci/ubuntu:19.04'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/old_ci/ubuntu:19.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
}
}
diff --git a/jenkins/ubuntu.pipeline b/jenkins/ubuntu.pipeline
index 235b1cb..6c892eb 100644
--- a/jenkins/ubuntu.pipeline
+++ b/jenkins/ubuntu.pipeline
@@ -1,8 +1,8 @@
pipeline {
agent {
docker {
- image 'controller.trafficserver.org/ats/old_ci/ubuntu:19.04'
- registryUrl 'https://controller.trafficserver.org/'
+ image 'ci.trafficserver.apache.org/ats/old_ci/ubuntu:19.04'
+ registryUrl 'https://ci.trafficserver.apache.org/'
label 'docker'
}
}