You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2022/01/31 21:16:16 UTC

[GitHub] [trafficcontrol] jrushford opened a new pull request #6530: Fixes the cache-config integration tests.

jrushford opened a new pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530


   CentOS 8 docker images used in the cache-config integration
   tests no-longer build as the CentOS 8 repositories have been
   taken down.  This PR fixes the issue by swithing the CentOS 8
   images to Rocky Linux images that are compatable with RHEL 8.
   
   ## Which Traffic Control components are affected by this PR?
   
   - Traffic Control Cache Config (T3C, formerly ORT)
   
   
   ## What is the best way to verify this PR?
   Cache-config tests pass
   
   
   ## If this is a bugfix, which Traffic Control versions contained the bug?
   
   ## PR submission checklist
   - [x] This PR has tests <!-- If not, please delete this text and explain why this PR does not need tests. -->
   - [x] This PR has documentation <!-- If not, please delete this text and explain why this PR does not need documentation. -->
   - [x] This PR has a CHANGELOG.md entry <!-- A fix for a bug from an ATC release, an improvement, or a new feature should have a changelog entry. -->
   - [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://apache.org/security) for details)
   
   <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
   distributed with this work for additional information
   regarding copyright ownership.  The ASF licenses this file
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
       http://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
   -->
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford commented on a change in pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford commented on a change in pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#discussion_r797063068



##########
File path: cache-config/testing/docker/variables.env
##########
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+# OS_DISTRO may be set to "centos", default is "rockylinux/rockylinux" since RHEL 8

Review comment:
       @zrhoffman ok, just fixed it.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1027280837


   > There are now an OS_VERSION and OS_DISTRO env variables in variables.env.
   
   Sounds good to me. `OS_VERSION` and `OS_DISTRO` are the env variable names the ATS repo uses, so it makes sense to use them here, too.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman merged pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
zrhoffman merged pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford edited a comment on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford edited a comment on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1027279879


   @zrhoffman There are now an OS_VERSION and OS_DISTRO env variables in variables.env.  They default to 8 and rockylinux/rocklinux respectively and can be overriden by editing variables.env to set OS_VERSION=7 and OS_DISTRO=centos.  


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford commented on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford commented on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1027279879


   There are now an OS_VERSION and OS_DISTRO env variables in variables.env.  They default to 8 and rockylinux/rocklinux respectively and can be overriden by editing variables.env to set OS_VERSION=7 and OS_DISTRO=centos.  


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford commented on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford commented on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1027318135


   @zrhoffman ok, I think I'm done here.  Did I address everything?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford edited a comment on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford edited a comment on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1026292197


   > Rocky Linux does not support EL7. Should there be a `BASE_IMAGE` Dockerfile arg with default value `rockylinux/rockylinux` so it can be overriden to `centos` when building for EL7?
   
   @zrhoffman Overlooked that, I'll fix it
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#discussion_r797058797



##########
File path: cache-config/testing/docker/variables.env
##########
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+# OS_DISTRO may be set to "centos", default is "rockylinux/rockylinux" since RHEL 8

Review comment:
       `"rockylinux/rockylinux` can be `"rockylinux`




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#discussion_r797008373



##########
File path: cache-config/testing/docker/docker-compose.yml
##########
@@ -57,6 +57,9 @@ services:
     ports: 
       - "443:443"
     build:
+      args:
+        - OS_DISTRO==${OS_DISTRO:-rockylinux/rockylinux}

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/traffic_ops/Dockerfile
##########
@@ -20,19 +20,23 @@
 # Based on CentOS 8
 ############################################################
 
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
-# Makes RHEL_VERSION available in later layers without needing to specify it again
-ENV RHEL_VERSION=$RHEL_VERSION
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/docker-compose-ats-build.yml
##########
@@ -26,19 +26,13 @@ volumes:
 services:
 
   trafficserver_build:
-    environment:
-      - ATS_VERSION=8.1.x
-      - CJOSE_URL=https://github.com/cisco/cjose
-      - CJOSE_TAG=latest
-      - JANSSON_URL=https://github.com/akheron/jansson
-      - JANSSON_TAG=v2.11
-      - OPENSSL_URL=https://github.com/openssl/openssl
-      - OPENSSL_TAG=OpenSSL_1_1_1
-      - RUN_ATS_UNIT_TESTS=false
+    env_file:
+      - variables.env
     build:
       context: ../../..
       dockerfile: cache-config/testing/docker/trafficserver/Dockerfile
       args:
-        RHEL_VERSION: ${RHEL_VERSION:-8}
+        - OS_VERSION=${OS_VERSION:-8}
+        - OS_DISTRO=${OS_DISTRO:-rockylinux/rockylinux}

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/docker-compose.yml
##########
@@ -82,7 +85,8 @@ services:
       - variables.env
     build:
       args:
-        RHEL_VERSION: ${RHEL_VERSION:-8}
+        - OS_DISTRO=${OS_DISTRO:-rockylinux/rockylinux}

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/trafficserver/Dockerfile
##########
@@ -19,31 +19,34 @@
 # Dockerfile to build Traffic Server RPM
 ###############################################################
 
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/variables.env
##########
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+# OS_DISTRO may be set to "centos", default is "rockylinux/rockylinux" since RHEL 8
+OS_DISTRO=rockylinux/rockylinux

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.

##########
File path: cache-config/testing/docker/ort_test/Dockerfile
##########
@@ -23,14 +23,19 @@
 # The recommended minimum size for each block devices is 1G.
 # For example, `sudo modprobe brd rd_size=1048576 rd_nr=2`
 
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux

Review comment:
       Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford commented on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford commented on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1026292197


   > Rocky Linux does not support EL7. Should there be a `BASE_IMAGE` Dockerfile arg with default value `rockylinux/rockylinux` so it can be overriden to `centos` when building for EL7?
   
   Overlooked that, I'll fix it
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] jrushford commented on pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
jrushford commented on pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#issuecomment-1027295584


   @zrhoffman ok rockylinux moves fast.  I'll make the changes, had a typo too.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #6530: Fixes the cache-config integration tests.

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#discussion_r797058797



##########
File path: cache-config/testing/docker/variables.env
##########
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+# OS_DISTRO may be set to "centos", default is "rockylinux/rockylinux" since RHEL 8

Review comment:
       `"rockylinux/rockylinux"` can be `"rockylinux"`




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org