Pull cord-tester images from dockerhub as they are available now on dockerhub.
Change image names to be compatible with dockerhub image names.
Update prerequisites.sh last step to pull all the cord-tester docker images.
This should make the cord-test.py build all step redundant now since images should be available for testing immediately after prerequisites.sh are run.
Change-Id: I64cf664a214924349d6728ca2a52974decdef47f
diff --git a/Dockerfile.tester b/Dockerfile.tester
index 966f45b..efbf359 100644
--- a/Dockerfile.tester
+++ b/Dockerfile.tester
@@ -7,7 +7,7 @@
python python-pip python-setuptools python-scapy tcpdump doxygen doxypy wget \
openvswitch-common openvswitch-switch \
python-twisted python-sqlite sqlite3 python-pexpect telnet arping isc-dhcp-server \
- python-paramiko python-maas-client
+ python-paramiko python-maas-client python-keystoneclient python-neutronclient python-glanceclient
RUN easy_install nose
RUN mkdir -p /root/ovs
WORKDIR /root
diff --git a/build.gradle b/build.gradle
index 3c9ebb0..c9239f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@
dockerPath = project.hasProperty('dockerPath') ? project.getProperty('dockerPath') : '/usr/bin'
- cordTesterImages = [ 'cord-test/radius:latest' : 'Dockerfile.radius', 'cord-test/quagga:latest' : 'Dockerfile.quagga', 'cord-test/nose:latest' : 'Dockerfile.tester' ]
+ cordTesterImages = [ 'cordtest/radius:candidate' : 'Dockerfile.radius', 'cordtest/quagga:candidate' : 'Dockerfile.quagga', 'cordtest/nose:candidate' : 'Dockerfile.tester' ]
}
@@ -121,45 +121,45 @@
}
task buildRadiusImage(type: Exec) {
- commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/radius', '-f', 'Dockerfile.radius', '.'
+ commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/radius', '-f', 'Dockerfile.radius', '.'
}
task tagRadiusImage(type: Exec) {
dependsOn buildRadiusImage
- commandLine "$dockerPath/docker", 'tag', 'cord-test/radius', "$targetReg/cord-test/radius:$targetTag"
+ commandLine "$dockerPath/docker", 'tag', 'cordtest/radius', "$targetReg/cordtest/radius:$targetTag"
}
task publishRadiusImage(type: Exec) {
dependsOn tagRadiusImage
- commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/radius:$targetTag"
+ commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/radius:$targetTag"
}
task buildQuaggaImage(type: Exec) {
- commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/quagga', '-f', 'Dockerfile.quagga', '.'
+ commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/quagga', '-f', 'Dockerfile.quagga', '.'
}
task tagQuaggaImage(type: Exec) {
dependsOn buildQuaggaImage
- commandLine "$dockerPath/docker", 'tag', 'cord-test/quagga', "$targetReg/cord-test/quagga:$targetTag"
+ commandLine "$dockerPath/docker", 'tag', 'cordtest/quagga', "$targetReg/cordtest/quagga:$targetTag"
}
task publishQuaggaImage(type: Exec) {
dependsOn tagQuaggaImage
- commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/quagga:$targetTag"
+ commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/quagga:$targetTag"
}
task buildTesterImage(type: Exec) {
- commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/nose', '-f', 'Dockerfile.tester', '.'
+ commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/nose', '-f', 'Dockerfile.tester', '.'
}
task tagTesterImage(type: Exec) {
dependsOn buildTesterImage
- commandLine "$dockerPath/docker", 'tag', 'cord-test/nose', "$targetReg/cord-test/nose:$targetTag"
+ commandLine "$dockerPath/docker", 'tag', 'cordtest/nose', "$targetReg/cordtest/nose:$targetTag"
}
task publishTesterImage(type: Exec) {
dependsOn tagTesterImage
- commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/nose:$targetTag"
+ commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/nose:$targetTag"
}
// Publish image(s) built during the build step into targetReg registry using the targetTag
diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml
index 55918b2..58fd316 100644
--- a/roles/prereq/tasks/main.yml
+++ b/roles/prereq/tasks/main.yml
@@ -85,7 +85,7 @@
become: yes
docker:
name: cord-test
- image: "{{ docker.registry }}/cord-test/nose:{{ docker.image_version }}"
+ image: "{{ docker.registry }}/cordtest/nose:{{ docker.image_version }}"
pull: always
state: absent
@@ -93,7 +93,7 @@
become: yes
docker:
name: cord-radius
- image: "{{ docker.registry }}/cord-test/radius:{{ docker.image_version }}"
+ image: "{{ docker.registry }}/cordtest/radius:{{ docker.image_version }}"
pull: always
state: absent
@@ -101,7 +101,7 @@
become: yes
docker:
name: cord-quagga
- image: "{{ docker.registry }}/cord-test/quagga:{{ docker.image_version }}"
+ image: "{{ docker.registry }}/cordtest/quagga:{{ docker.image_version }}"
pull: always
state: absent
diff --git a/src/test/monitoring/monitoringTest.py b/src/test/monitoring/monitoringTest.py
index f9889de..6a24da8 100644
--- a/src/test/monitoring/monitoringTest.py
+++ b/src/test/monitoring/monitoringTest.py
@@ -58,7 +58,7 @@
serverDetails = cls.serverOptionsList
stats_choice = 'COLLECTD'
test_name = cls.testHostName
- test_image = 'cord-test/nose'
+ test_image = 'cordtest/nose'
if stats_choice in stats:
onos_ctrl = OnosCtrl('org.onosproject.cpman')
status, _ = onos_ctrl.activate()
diff --git a/src/test/netCondition/netConditionTest.py b/src/test/netCondition/netConditionTest.py
index 5005772..15156d7 100644
--- a/src/test/netCondition/netConditionTest.py
+++ b/src/test/netCondition/netConditionTest.py
@@ -2162,7 +2162,7 @@
threads = []
threads_status = []
clients = 1
- radius_image = 'cord-test/radius:candidate'
+ radius_image = 'cordtest/radius:candidate'
delay = 20
que = Queue.Queue()
def eap_tls_emulating_server_pkts(df):
@@ -2208,7 +2208,7 @@
threads = []
threads_status = []
clients = 1
- radius_image = 'cord-test/radius:candidate'
+ radius_image = 'cordtest/radius:candidate'
delay = 20
que = Queue.Queue()
def tls_client_packets(start):
@@ -2412,4 +2412,3 @@
df.callback(0)
reactor.callLater(0, eap_tls_emulating_server_pkts, df)
return df
-
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index aa8532b..ae2d336 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -49,7 +49,7 @@
)
basename = 'cord-tester'
switch_on_olt = False
- IMAGE = 'cord-test/nose'
+ IMAGE = 'cordtest/nose'
ALL_TESTS = ('tls', 'dhcp', 'dhcprelay','igmp', 'subscriber',
'cordSubscriber', 'vrouter', 'flows', 'proxyarp', 'acl', 'xos', 'fabric',
'cbench', 'cluster', 'netCondition', 'cordvtn', 'iperf', 'mini', 'vsg')
@@ -363,7 +363,7 @@
def modify_scapy_files_for_specific_tests(self):
name = self.name
- container_cmd_exec = Container(name = name, image = 'cord-test/nose')
+ container_cmd_exec = Container(name = name, image = CordTester.IMAGE)
tty = False
dckr = Client()
cmd = 'cp test/src/test/scapy/fields.py /usr/local/lib/python2.7/dist-packages/scapy/fields.py '
diff --git a/src/test/setup/prerequisites.sh b/src/test/setup/prerequisites.sh
index 1cbea42..4874838 100755
--- a/src/test/setup/prerequisites.sh
+++ b/src/test/setup/prerequisites.sh
@@ -117,3 +117,9 @@
service openvswitch-switch stop
install_ovs
fi
+
+test_images=(cordtest/radius:candidate cordtest/quagga:candidate cordtest/nose:candidate)
+for img in ${test_images[*]}; do
+ echo "Pulling cord-tester image $img"
+ docker pull $img 2>/dev/null
+done
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index cd31827..6ab5363 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -832,7 +832,7 @@
host_guest_map = ( (host_db_dir, guest_db_dir),
(host_config_dir, guest_config_dir)
)
- IMAGE = 'cord-test/radius'
+ IMAGE = 'cordtest/radius'
NAME = 'cord-radius'
def __init__(self, name = NAME, image = IMAGE, prefix = '', tag = 'candidate',
@@ -881,7 +881,7 @@
guest_quagga_config = '/root/config'
quagga_config_file = os.path.join(guest_quagga_config, 'testrib.conf')
host_guest_map = ( (host_quagga_config, guest_quagga_config), )
- IMAGE = 'cord-test/quagga'
+ IMAGE = 'cordtest/quagga'
NAME = 'cord-quagga'
def __init__(self, name = NAME, image = IMAGE, prefix = '', tag = 'candidate',
diff --git a/src/test/utils/CordLogger.py b/src/test/utils/CordLogger.py
index cc1845b..1efe086 100644
--- a/src/test/utils/CordLogger.py
+++ b/src/test/utils/CordLogger.py
@@ -170,7 +170,7 @@
serverDetails = cls.serverOptionsList
stat_choice = 'COLLECTD'
test_name = cls.testHostName
- test_image = 'cord-test/nose'
+ test_image = 'cordtest/nose'
if stat_choice in stat:
onos_ctrl = OnosCtrl('org.onosproject.cpman')
status, _ = onos_ctrl.activate()
@@ -222,4 +222,3 @@
if stat_choice in stat:
onos_ctrl = OnosCtrl('org.onosproject.cpman')
status, _ = onos_ctrl.deactivate()
-