diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2023-01-16 10:21:29 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2023-01-16 20:51:09 +0000 |
| commit | f34f32f31925cba0ed8ef034184e0de1c7398487 (patch) | |
| tree | 36695e68a76b240f70914dd3a3100971c7a3c2b5 | |
| parent | 3f951433b89df4639bb2ae8f297aee90c70cebf5 (diff) | |
hs-test: better directory structure
Move config files to resources and docker files to separate directory
Type: test
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: I24dd0705c4a463c06de525f28cb54d882527320a
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.nginx (renamed from extras/hs-test/Dockerfile.nginx) | 0 | ||||
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.vpp (renamed from extras/hs-test/Dockerfile.vpp) | 0 | ||||
| -rw-r--r-- | extras/hs-test/resources/envoy/envoy.log (renamed from extras/hs-test/envoy/envoy.log) | 0 | ||||
| -rw-r--r-- | extras/hs-test/resources/envoy/proxy.yaml (renamed from extras/hs-test/envoy/proxy.yaml) | 0 | ||||
| -rw-r--r-- | extras/hs-test/resources/envoy/vcl.conf (renamed from extras/hs-test/envoy/vcl.conf) | 0 | ||||
| -rwxr-xr-x | extras/hs-test/script/build.sh | 4 | ||||
| -rw-r--r-- | extras/hs-test/topo-containers/ns.yaml | 4 |
7 files changed, 4 insertions, 4 deletions
diff --git a/extras/hs-test/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx index 930151fefef..930151fefef 100644 --- a/extras/hs-test/Dockerfile.nginx +++ b/extras/hs-test/docker/Dockerfile.nginx diff --git a/extras/hs-test/Dockerfile.vpp b/extras/hs-test/docker/Dockerfile.vpp index f95df2277c9..f95df2277c9 100644 --- a/extras/hs-test/Dockerfile.vpp +++ b/extras/hs-test/docker/Dockerfile.vpp diff --git a/extras/hs-test/envoy/envoy.log b/extras/hs-test/resources/envoy/envoy.log index e69de29bb2d..e69de29bb2d 100644 --- a/extras/hs-test/envoy/envoy.log +++ b/extras/hs-test/resources/envoy/envoy.log diff --git a/extras/hs-test/envoy/proxy.yaml b/extras/hs-test/resources/envoy/proxy.yaml index e4a5b81ff65..e4a5b81ff65 100644 --- a/extras/hs-test/envoy/proxy.yaml +++ b/extras/hs-test/resources/envoy/proxy.yaml diff --git a/extras/hs-test/envoy/vcl.conf b/extras/hs-test/resources/envoy/vcl.conf index 164435a6ae5..164435a6ae5 100644 --- a/extras/hs-test/envoy/vcl.conf +++ b/extras/hs-test/resources/envoy/vcl.conf diff --git a/extras/hs-test/script/build.sh b/extras/hs-test/script/build.sh index 5c51244cf9f..dd6f9c02575 100755 --- a/extras/hs-test/script/build.sh +++ b/extras/hs-test/script/build.sh @@ -10,5 +10,5 @@ mkdir -p ${bin} ${lib} || true cp ${VPP_WS}/build-root/build-vpp_debug-native/vpp/bin/* ${bin} cp -r ${VPP_WS}/build-root/build-vpp_debug-native/vpp/lib/x86_64-linux-gnu/* ${lib} -docker build --build-arg UBUNTU_VERSION -t hs-test/vpp -f Dockerfile.vpp . -docker build --build-arg UBUNTU_VERSION -t hs-test/nginx-ldp -f Dockerfile.nginx . +docker build --build-arg UBUNTU_VERSION -t hs-test/vpp -f docker/Dockerfile.vpp . +docker build --build-arg UBUNTU_VERSION -t hs-test/nginx-ldp -f docker/Dockerfile.nginx . diff --git a/extras/hs-test/topo-containers/ns.yaml b/extras/hs-test/topo-containers/ns.yaml index e472531c8f7..9416937fdb6 100644 --- a/extras/hs-test/topo-containers/ns.yaml +++ b/extras/hs-test/topo-containers/ns.yaml @@ -12,12 +12,12 @@ containers: is-default-work-dir: true - name: "envoy" volumes: - - host-dir: "$HST_DIR/envoy/proxy.yaml" + - host-dir: "$HST_DIR/resources/envoy/proxy.yaml" container-dir: "/etc/envoy/envoy.yaml" - <<: *shared-vol container-dir: "/tmp/vpp-envoy" is-default-work-dir: true - - host-dir: "$HST_DIR/envoy" + - host-dir: "$HST_DIR/resources/envoy" container-dir: "/tmp" vars: - name: "ENVOY_UID" |