remove legacy docker hub hook; wait until specific log message instea… (#1622)

* remove legacy docker hub hook; wait until specific log message instead of fixed timespan

* make sure to run correct NSS version during tests

Author: angelo-v

.github/workflows/ci.yml

@@ -57,25 +57,25 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+        with:
+          tagRegex: "v?(?<version>.*)"
+
       - name: Lint dockerfile
         working-directory: docker-image
         run: pwd && ls -lah && make lint
 
       - name: Run tests
         working-directory: docker-image
-        run: make test
+        run: SOLID_SERVER_VERSION=${{ steps.tagName.outputs.version }} make test
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - uses: olegtarasov/get-tag@v2.1
-        id: tagName
-        with:
-          tagRegex: "(?<version>.*)"
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3

docker-image/Makefile

@@ -2,6 +2,7 @@ test: ## run testinfra tests against the project
 	docker run --rm -t \
 		-v $(shell pwd):/project \
 		-v /var/run/docker.sock:/var/run/docker.sock:ro \
+		-e SOLID_SERVER_VERSION="${SOLID_SERVER_VERSION}" \
 		aveltens/docker-testinfra
 
 lint: ## run hadolint against the Dockerfile

docker-image/src/hooks/build

@@ -1,11 +1,15 @@
 import docker
 import pytest
+import os
+
 
 @pytest.fixture(scope="session")
 def client():
     return docker.from_env()
 
+
 @pytest.fixture(scope="session")
 def image(client):
-     img, _ = client.images.build(path='./src', dockerfile='Dockerfile')
-     return img
+    img, _ = client.images.build(path='./src', dockerfile='Dockerfile',
+                                 buildargs={"SOLID_SERVER_VERSION": os.environ['SOLID_SERVER_VERSION']})
+    return img

docker-image/test/__init__.py

@@ -1,10 +1,11 @@
 # coding=utf-8
 import docker
 import pytest
-import time
 
 import os
 
+from test.wait_for_container import wait_for_container
+
 testinfra_hosts = ['docker://test_container']
 
 
@@ -21,8 +22,7 @@ def container(client, image):
       detach=True,
       tty=True
   )
-  # give the solid process some seconds to create the directory structure before making assertions
-  time.sleep(2)
+  wait_for_container(container, "Finished: ERROR")
   yield container
   container.remove(force=True)
 

docker-image/test/conftest.py

@@ -1,7 +1,8 @@
 # coding=utf-8
 import docker
 import pytest
-import time
+
+from test.wait_for_container import wait_for_container
 
 testinfra_hosts = ['docker://test_container']
 
@@ -23,8 +24,7 @@ def container(client, image):
       detach=True,
       tty=True
   )
-  # give the solid process some seconds to create the directory structure before making assertions
-  time.sleep(2)
+  wait_for_container(container, "Finished: ERROR")
   yield container
   container.remove(force=True)
 

docker-image/test/test_non_accessible_key_cert.py

@@ -1,6 +1,6 @@
-import docker
 import pytest
-import time
+
+from test.wait_for_container import wait_for_container
 
 testinfra_hosts = ['docker://test_container']
 
@@ -12,8 +12,7 @@ def container(client, image):
         detach=True,
         tty=True
     )
-    # give the solid process some seconds to create the directory structure before making assertions
-    time.sleep(10)
+    wait_for_container(container)
     yield container
     container.remove(force=True)
 

docker-image/test/test_precondition_checks.py

@@ -1,53 +1,55 @@
 import docker
 import pytest
-import time
+
+from test.wait_for_container import wait_for_container
 
 testinfra_hosts = ['docker://test_container']
 
 @pytest.fixture(scope="module", autouse=True)
 def solid_server(client, image):
-  container = client.containers.run(
-      image.id,
-      name="solid_server",
-      detach=True,
-      tty=True
-  )
-  # give the solid process some seconds to create the directory structure before making assertions
-  time.sleep(2)
-  yield container
-  container.remove(force=True)
+    container = client.containers.run(
+        image.id,
+        name="solid_server",
+        detach=True,
+        tty=True
+    )
+    wait_for_container(container)
+    yield container
+    container.remove(force=True)
+
 
 @pytest.fixture(scope="module", autouse=True)
 def container(client, solid_server):
-  container = client.containers.run(
-      'alpine',
-      name="test_container",
-      detach=True,
-      tty=True,
-      volumes_from=solid_server.id
-  )
-  # give the solid process some seconds to create the directory structure before making assertions
-  time.sleep(2)
-  yield container
-  container.remove(force=True)
+    container = client.containers.run(
+        'alpine',
+        name="test_container",
+        detach=True,
+        tty=True,
+        volumes_from=solid_server.id
+    )
+    yield container
+    container.remove(force=True)
+
 
 def test_solid_data_dir_is_mounted(host):
-  solid_data = host.file("/opt/solid/data/")
-  assert solid_data.exists
-  assert solid_data.is_directory
-  assert solid_data.uid == 1000
-  assert solid_data.gid == 1000
+    solid_data = host.file("/opt/solid/data/")
+    assert solid_data.exists
+    assert solid_data.is_directory
+    assert solid_data.uid == 1000
+    assert solid_data.gid == 1000
+
 
 def test_solid_db_dir_is_mounted(host):
-  solid_db = host.file("/opt/solid/.db/")
-  assert solid_db.exists
-  assert solid_db.is_directory
-  assert solid_db.uid == 1000
-  assert solid_db.gid == 1000
+    solid_db = host.file("/opt/solid/.db/")
+    assert solid_db.exists
+    assert solid_db.is_directory
+    assert solid_db.uid == 1000
+    assert solid_db.gid == 1000
+
 
 def test_solid_config_dir_is_mounted(host):
-  solid_config = host.file("/opt/solid/config/")
-  assert solid_config.exists
-  assert solid_config.is_directory
-  assert solid_config.uid == 1000
-  assert solid_config.gid == 1000
+    solid_config = host.file("/opt/solid/config/")
+    assert solid_config.exists
+    assert solid_config.is_directory
+    assert solid_config.uid == 1000
+    assert solid_config.gid == 1000

docker-image/test/test_solid_default_config.py

@@ -0,0 +1,8 @@
+import time
+
+def wait_for_container(container, message="running on"):
+    count = 0
+    while (not message in container.logs()) and (count < 10):
+        count = count + 1
+        time.sleep(1)
+    assert message in container.logs(), 'Expected message not present until timeout. Waited for "%s"' % message