aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VPP_DEVICE_IMAGE_UBUNTU2
-rw-r--r--VPP_DEVICE_IMAGE_UBUNTU_ARM2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile (renamed from resources/tools/disk-image-builder/csit-sut/Dockerfile)14
-rw-r--r--resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf (renamed from resources/tools/disk-image-builder/csit-sut/supervisord.conf)2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml27
-rw-r--r--resources/tools/testbed-setup/ansible/vpp_device.yaml2
6 files changed, 39 insertions, 10 deletions
diff --git a/VPP_DEVICE_IMAGE_UBUNTU b/VPP_DEVICE_IMAGE_UBUNTU
index 3f47e59a88..e0a799272f 100644
--- a/VPP_DEVICE_IMAGE_UBUNTU
+++ b/VPP_DEVICE_IMAGE_UBUNTU
@@ -1 +1 @@
-snergster/csit-sut:latest
+csit_dut-ubuntu1804:local
diff --git a/VPP_DEVICE_IMAGE_UBUNTU_ARM b/VPP_DEVICE_IMAGE_UBUNTU_ARM
index 46a5db3578..e0a799272f 100644
--- a/VPP_DEVICE_IMAGE_UBUNTU_ARM
+++ b/VPP_DEVICE_IMAGE_UBUNTU_ARM
@@ -1 +1 @@
-snergster/csit-arm-sut:latest
+csit_dut-ubuntu1804:local
diff --git a/resources/tools/disk-image-builder/csit-sut/Dockerfile b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
index aa5ddf288d..6dddad6ebb 100644
--- a/resources/tools/disk-image-builder/csit-sut/Dockerfile
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed 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:
@@ -12,9 +12,8 @@
# limitations under the License.
FROM ubuntu:18.04
-MAINTAINER csit-dev <csit-dev@lists.fd.io>
LABEL Description="CSIT vpp-device ubuntu 18.04 SUT image"
-LABEL Version="1.0"
+LABEL Version="master"
# Setup the environment
ENV DEBIAN_FRONTEND=noninteractive
@@ -57,6 +56,7 @@ RUN apt-get -q update \
python-cffi \
python-cffi-backend \
python-dev \
+ python-enum34 \
python-pip \
python-setuptools \
python-virtualenv \
@@ -114,11 +114,9 @@ RUN pip3 install \
scapy==2.4.3 \
scp==0.13.2 \
ansible==2.7.8 \
- ply==3.11 \
dill==0.2.8.2 \
numpy==1.17.3 \
hdrhistogram==0.6.1 \
- pandas==0.25.3 \
plotly==4.1.1 \
PTable==0.9.2 \
Sphinx==2.2.1 \
@@ -158,7 +156,9 @@ RUN pip3 install \
urllib3==1.25.6
# ARM workaround
-RUN pip3 install scipy==1.1.0
+RUN pip3 install \
+ pandas==0.25.3 \
+ scipy==1.1.0
# SSH settings
RUN echo 'root:Csit1234' | chpasswd \
@@ -170,4 +170,4 @@ EXPOSE 2222
COPY supervisord.conf /etc/supervisor/supervisord.conf
-CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisor/supervisord.conf; /usr/sbin/sshd -D -p 2222"]
+CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisor/supervisord.conf; /usr/sbin/sshd -D -p 2222"] \ No newline at end of file
diff --git a/resources/tools/disk-image-builder/csit-sut/supervisord.conf b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf
index 4a6fe96568..22a36be5c6 100644
--- a/resources/tools/disk-image-builder/csit-sut/supervisord.conf
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf
@@ -21,4 +21,4 @@ command = /usr/bin/vpp -c /etc/vpp/startup.conf
autostart = false
autorestart = true
redirect_stderr = true
-priority = 1
+priority = 1 \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml
new file mode 100644
index 0000000000..6ea469b415
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml
@@ -0,0 +1,27 @@
+---
+# file: roles/csit_sut_image/tasks/main.yaml
+
+- name: Create a directory if it does not exist
+ file:
+ path: "/opt/csit-sut/"
+ state: "directory"
+ mode: 0755
+ tags: csit-sut-image
+
+- name: Copy Build Items
+ copy:
+ src: "{{ item }}"
+ dest: "/opt/csit-sut/"
+ owner: "root"
+ group: "root"
+ mode: 0755
+ with_items:
+ - Dockerfile
+ - supervisord.conf
+ tags: csit-sut-image
+
+- name: Build CSIT SUT Docker Image
+ shell: "docker build -t csit_dut-ubuntu1804:local ."
+ args:
+ chdir: "/opt/csit-sut"
+ tags: csit-sut-image \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/vpp_device.yaml b/resources/tools/testbed-setup/ansible/vpp_device.yaml
index 8a99166f04..aae5ad3039 100644
--- a/resources/tools/testbed-setup/ansible/vpp_device.yaml
+++ b/resources/tools/testbed-setup/ansible/vpp_device.yaml
@@ -16,6 +16,8 @@
tags: vpp_device
- role: kernel_vm
tags: kernel_vm
+ - role: csit_sut_image
+ tags: csit_sut_image
- role: nomad
tags: nomad
- role: cleanup