You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2023/10/19 17:17:14 UTC
[trafficcontrol] branch master updated: Add certs for certificate-based authentication API test (#7839)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 0669f16071 Add certs for certificate-based authentication API test (#7839)
0669f16071 is described below
commit 0669f16071d75ce4cb643ea4a78d5176a17ccfd8
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Thu Oct 19 11:17:09 2023 -0600
Add certs for certificate-based authentication API test (#7839)
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 8 ++++++++
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile.dockerignore | 1 +
.../cdn-in-a-box/traffic_ops_integration_test/Dockerfile | 1 +
3 files changed, 10 insertions(+)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index b5d8147dc1..0c62a00e2e 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -103,6 +103,14 @@ COPY $TRAFFIC_OPS_RPM /traffic_ops.rpm
RUN rpm -Uvh /traffic_ops.rpm && \
rm /traffic_ops.rpm
+COPY .github/actions/to-integration-tests/intermediate.crt.pem \
+ .github/actions/to-integration-tests/intermediate.key.pem \
+ .github/actions/to-integration-tests/rootca.crt.pem \
+ .github/actions/to-integration-tests/rootca.key.pem \
+ .github/actions/to-integration-tests/server.crt.pem \
+ .github/actions/to-integration-tests/server.key.pem \
+ /etc/pki/tls/traffic_ops/
+
COPY infrastructure/cdn-in-a-box/enroller/server_template.json \
infrastructure/cdn-in-a-box/traffic_ops/config.sh \
infrastructure/cdn-in-a-box/traffic_ops/run-go.sh \
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile.dockerignore b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile.dockerignore
index 767be69801..5c04c75dc8 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile.dockerignore
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile.dockerignore
@@ -23,5 +23,6 @@
# - https://github.com/docker/compose/pull/6865
# - https://docs.docker.com/develop/develop-images/build_enhancements/
*
+!.github/actions/to-integration-tests/*.pem
!infrastructure/cdn-in-a-box/
!traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
index 95ee02636f..cb1f823889 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -73,6 +73,7 @@ COPY ./infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh /opt/i
COPY ./traffic_ops/testing/api/v3/tc-fixtures.json /opt/integration/app/tc-fixtures-v3.json
COPY ./traffic_ops/testing/api/v4/tc-fixtures.json /opt/integration/app/tc-fixtures-v4.json
COPY ./traffic_ops/testing/api/v5/tc-fixtures.json /opt/integration/app/tc-fixtures-v5.json
+COPY ./traffic_ops/testing/api/v5/client-intermediate-chain.crt.pem ./traffic_ops/testing/api/v5/client.key.pem /opt/integration/app/
COPY --from=integration-builder \
/go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api/traffic_ops_v3_integration_test \
/go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api/traffic_ops_v4_integration_test \