Remove TNF_OC_DEBUG_IMAGE_ID env var (#529)

* Remove TNF_OC_DEBUG_IMAGE_ID env var

We no longer need to specify the TNF_OC_DEBUG_IMAGE_ID environment
variable, since we are using the new debug pod image. This commit
removes all usage of the env var, and updates documentation to reflect
the current situation.

* Remove common/command.go handler

It is no longer needed once the TNF_OC_DEBUG_IMAGE_ID environment
variable is removed.

Author: javierpena

README.md

@@ -114,12 +114,10 @@ export TNF_PARTNER_SRC_DIR=/home/userid/code/cnf-certification-test-partner
 When this variable is set, the run-cnf-suites.sh script will deploy/refresh the partner deployments/pods in the cluster before starting the test run.
 
 ### Disconnected environment
-In disconnected environment, only specific versions of images are mirrored to the local repo. For the `oc debug` command (used by a number of tests) to work, set TNF_OC_DEBUG_IMAGE_ID:
+In a disconnected environment, only specific versions of images are mirrored to the local repo. For those environments,
+the partner pod image `quay.io/testnetworkfunction/cnf-test-partner` and debug pod image `quay.io/testnetworkfunction/debug-partner` should be mirrored
+and `TNF_PARTNER_REPO` should be set to the local repo, e.g.:
 
-```shell-script
-export TNF_OC_DEBUG_IMAGE_ID="registry.dfwt5g.lab:5000/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f5ce898fbad3671fecd6f797130f950fb1abdbaf0d8154c22e2b59c74e3a918"
-```
-For similar reasons, the partner pod image `quay.io/testnetworkfunction/cnf-test-partner` should be mirrored too and `TNF_PARTNER_REPO` should be set to the local repo, e.g.:
 ```shell-script
 export TNF_PARTNER_REPO="registry.dfwt5g.lab:5000/testnetworkfunction"
 ```

pkg/tnf/handlers/common/command.go

@@ -20,7 +20,6 @@ import (
 	"time"
 
 	"github.com/test-network-function/test-network-function/pkg/tnf"
-	"github.com/test-network-function/test-network-function/pkg/tnf/handlers/common"
 	"github.com/test-network-function/test-network-function/pkg/tnf/identifier"
 	"github.com/test-network-function/test-network-function/pkg/tnf/reel"
 )
@@ -43,7 +42,7 @@ func NewReadRemoteFile(timeout time.Duration, nodeName, filePath string) *ReadRe
 		timeout: timeout,
 		result:  tnf.ERROR,
 		args: []string{
-			"echo", "\"cat /host" + filePath + "\"", "|", common.GetOcDebugCommand(), "-q", "node/" + nodeName,
+			"echo", "\"cat /host" + filePath + "\"", "|", "oc", "debug", "-q", "node/" + nodeName,
 		},
 	}
 }

pkg/tnf/handlers/common/doc.go

@@ -107,7 +107,6 @@ ${TNF_CONTAINER_CLIENT} run --rm $DNS_ARG \
 	-e TNF_PARTNER_NAMESPACE=$TNF_PARTNER_NAMESPACE \
 	-e TNF_PARTNER_REPO=$TNF_PARTNER_REPO \
 	-e TNF_DEPLOYMENT_TIMEOUT=$TNF_DEPLOYMENT_TIMEOUT \
-	-e TNF_OC_DEBUG_IMAGE_ID=$TNF_OC_DEBUG_IMAGE_ID \
 	-e LOG_LEVEL=$LOG_LEVEL \
 	-e PATH=/usr/bin:/usr/local/oc/bin \
 	$TNF_IMAGE \

pkg/tnf/handlers/readremotefile/readremotefile.go

@@ -76,11 +76,6 @@ func Intrusive() bool {
 	return !b
 }
 
-// GetOcDebugImageID is for running oc debug commands in a disconnected environment with a specific oc debug pod image mirrored
-func GetOcDebugImageID() string {
-	return os.Getenv("TNF_OC_DEBUG_IMAGE_ID")
-}
-
 // logLevel retrieves the LOG_LEVEL environment variable
 func logLevel() string {
 	logLevel := os.Getenv("LOG_LEVEL")

script/run-container.sh

@@ -33,7 +33,6 @@ import (
 	"github.com/test-network-function/test-network-function/pkg/config"
 	"github.com/test-network-function/test-network-function/pkg/junit"
 	"github.com/test-network-function/test-network-function/pkg/tnf"
-	tnfcommon "github.com/test-network-function/test-network-function/pkg/tnf/handlers/common"
 
 	utils "github.com/test-network-function/test-network-function/pkg/utils"
 	_ "github.com/test-network-function/test-network-function/test-network-function/accesscontrol"
@@ -143,8 +142,6 @@ func TestTest(t *testing.T) {
 	}
 	log.Info("Version: ", gitDisplayRelease, " ( ", GitCommit, " )")
 
-	tnfcommon.OcDebugImageID = common.GetOcDebugImageID()
-
 	// Initialize the claim with the start time, tnf version, etc.
 	claimRoot := createClaimRoot()
 	claimData := claimRoot.Claim