Revert "[INFRA] Use integraion script to run onap-k8s test"

This reverts commit 05a15ef4d6a4e2b2b25f18fb84aa0447019bf228.

Reason for revert: <INSERT REASONING HERE>

Issue-ID: INT-2226
Change-Id: Ic8ca67b37f5e45eed9a21117abc59422ef117250
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>

diff --git a/infra-healthcheck/.dockerignore b/infra-healthcheck/.dockerignore
deleted file mode 100644 (file)
index a05272f..0000000
--- a/infra-healthcheck/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-README.md
-tox.ini
-docker/Dockerfile
\ No newline at end of file

diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index 9cab01d..24fa61d 100644 (file)
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -14,8 +14,7 @@ ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
 ADD https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/amd64/kubectl /usr/local/bin/kubectl
 
-# COPY upper-constraints.txt .
-COPY . .
+COPY upper-constraints.txt .
 
 RUN set -x && \
     apk --no-cache add --update curl ca-certificates && \
@@ -30,12 +29,11 @@ RUN set -x && \
     chmod +x /usr/local/bin/helm3 && \
     rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \
     pip3 install --upgrade pip && \
-    pip3 install --no-cache-dir -r requirements.txt -c upper-constraints.txt && \
-    pip3 install --no-cache-dir -e . && \
+    pip3 install --no-cache-dir -r upper-constraints.txt && \
+    pip3 install --no-cache-dir \
+        git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck && \
     pip3 install --no-cache-dir \
         git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates && \
-    pip3 install --ignore-installed --no-cache-dir \
-        git+https://git.onap.org/testsuite/pythonsdk-tests.git@$ONAP_TESTS_TAG && \
     apk del .build-deps
 
 COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml

diff --git a/infra-healthcheck/docker/testcases.yaml b/infra-healthcheck/docker/testcases.yaml
index 287b64e..0cd8fe8 100644 (file)
--- a/infra-healthcheck/docker/testcases.yaml
+++ b/infra-healthcheck/docker/testcases.yaml
@@ -16,7 +16,7 @@ tiers:
                     This test case verifies that the ONAP pods are all Running
                     and shows the pods, deployments, svc and events
                 run:
-                    name: 'namespace_status'
+                    name: 'onap_k8s'
             -
                 case_name: onap-helm
                 project_name: integration

diff --git a/infra-healthcheck/requirements.txt b/infra-healthcheck/requirements.txt
index 58171bc..1918e10 100644 (file)
--- a/infra-healthcheck/requirements.txt
+++ b/infra-healthcheck/requirements.txt
@@ -11,5 +11,6 @@ bashate # Apache-2.0
 xtesting
 kubernetes # Apache-2.0
 colorama # BSD
+kubernetes_status
 helm_onap_status
 chart_status
\ No newline at end of file

diff --git a/infra-healthcheck/setup.cfg b/infra-healthcheck/setup.cfg
new file mode 100644 (file)
index 0000000..4eb4770
--- /dev/null
+++ b/infra-healthcheck/setup.cfg
@@ -0,0 +1,15 @@
+[metadata]
+name = infra_healthcheck
+version = 1
+
+[files]
+packages = infra_healthcheck
+
+[entry_points]
+xtesting.testcase =
+    onap_k8s = kubernetes_status.status:Status
+    onap_helm = helm_onap_status.status:Status
+    onap_chart = chart_status.status:Status
+    nodeport_ingress = infra_healthcheck.k8stest:OnapSecurityNodePortsIngress
+    nodeport_check_certs = infra_healthcheck.k8stest:OnapSecurityNodePortsCerts
+    internal_check_certs = infra_healthcheck.k8stest:OnapSecurityInternalPortsCerts

diff --git a/infra-healthcheck/setup.py b/infra-healthcheck/setup.py
index ee1ecad..566d844 100644 (file)
--- a/infra-healthcheck/setup.py
+++ b/infra-healthcheck/setup.py
@@ -19,19 +19,11 @@ import setuptools
 # In python < 2.7.4, a lazy loading of package `pbr` will break
 # setuptools if some other modules registered functions in `atexit`.
 # solution from: http://bugs.python.org/issue15881#msg170215
-
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
 
 setuptools.setup(
-    name="infra_healthcheck",
-    version="1",
-    packages=["infra_healthcheck"],
-    entry_points={
-        "xtesting.testcase": [
-            'onap_helm = helm_onap_status.status:Status',
-            'onap_chart = chart_status.status:Status',
-            'nodeport_ingress = infra_healthcheck.k8stest:OnapSecurityNodePortsIngress',
-            'nodeport_check_certs = infra_healthcheck.k8stest:OnapSecurityNodePortsCerts',
-            'internal_check_certs = infra_healthcheck.k8stest:OnapSecurityInternalPortsCerts'
-        ]
-    }
-)
+    setup_requires=['pbr>=2.0.0'],
+    pbr=True)

diff --git a/infra-healthcheck/upper-constraints.txt b/infra-healthcheck/upper-constraints.txt
index 20fdc2e..62176f9 100644 (file)
--- a/infra-healthcheck/upper-constraints.txt
+++ b/infra-healthcheck/upper-constraints.txt
@@ -1,2 +1,3 @@
+git+https://gitlab.com/Orange-OpenSource/lfn/tools/kubernetes-status.git#egg=kubernetes_status
 git+https://gitlab.com/Orange-OpenSource/lfn/tools/helm-onap-status.git#egg=helm_onap_status
 git+https://gitlab.com/Orange-OpenSource/lfn/tools/chart-status.git#egg=chart_status