Remove some output from e2e tests as they are too noisy for reference files

Author: sebastianrath

.gitignore

@@ -29,7 +29,6 @@ __pycache__/
 # Temp files
 .DS_Store
 
-*.test
 tests_e2e/coverage
 
 # Output of the go coverage tool, specifically when used with LiteIDE

core/docker.go

@@ -97,8 +97,12 @@ func (d *DockerClient) ImageExists(ctx context.Context, imageRef string) (bool,
 }
 
 func (d *DockerClient) PullImage(ctx context.Context, imageRef string) error {
-	utils.LogOut.Infof("%sPulling image '%s'\n", utils.LogGhStartGroup, imageRef)
-	defer utils.LogOut.Infof(utils.LogGhEndGroup)
+	verbose := !IsTestE2eRunning()
+
+	if verbose {
+		utils.LogOut.Infof("%sPulling image '%s'\n", utils.LogGhStartGroup, imageRef)
+		defer utils.LogOut.Infof(utils.LogGhEndGroup)
+	}
 
 	reader, err := d.cli.ImagePull(ctx, imageRef, image.PullOptions{})
 	if err != nil {
@@ -116,11 +120,13 @@ func (d *DockerClient) PullImage(ctx context.Context, imageRef string) error {
 			return err
 		}
 
-		if status, ok := event["status"].(string); ok {
-			if progress, ok := event["progress"].(string); ok {
-				utils.LogOut.Infof("  %s %s\n", status, progress)
-			} else {
-				utils.LogOut.Infof("  %s\n", status)
+		if verbose {
+			if status, ok := event["status"].(string); ok {
+				if progress, ok := event["progress"].(string); ok {
+					utils.LogOut.Infof("  %s %s\n", status, progress)
+				} else {
+					utils.LogOut.Infof("  %s\n", status)
+				}
 			}
 		}
 	}
@@ -129,8 +135,12 @@ func (d *DockerClient) PullImage(ctx context.Context, imageRef string) error {
 }
 
 func (d *DockerClient) BuildImage(ctx context.Context, dockerfilePath, contextPath, tag string) error {
-	utils.LogOut.Infof("%sBuilding image '%s' from %s\n", utils.LogGhStartGroup, tag, dockerfilePath)
-	defer utils.LogOut.Infof(utils.LogGhEndGroup)
+	verbose := !IsTestE2eRunning()
+
+	if verbose {
+		utils.LogOut.Infof("%sBuilding image '%s' from %s\n", utils.LogGhStartGroup, tag, dockerfilePath)
+		defer utils.LogOut.Infof(utils.LogGhEndGroup)
+	}
 
 	// Create a tar archive of the build context
 	buildContext, err := createBuildContext(contextPath)
@@ -165,8 +175,10 @@ func (d *DockerClient) BuildImage(ctx context.Context, dockerfilePath, contextPa
 			return err
 		}
 
-		if stream, ok := event["stream"].(string); ok {
-			utils.LogOut.Infof("%s", stream)
+		if verbose {
+			if stream, ok := event["stream"].(string); ok {
+				utils.LogOut.Infof("%s", stream)
+			}
 		}
 		if errMsg, ok := event["error"].(string); ok {
 			return fmt.Errorf("build error: %s", errMsg)

…eferences/reference_docker-alpine.sh_l11 …ces/reference_docker-alpine_linux.sh_l11tests_e2e/references/reference_docker-alpine.sh_l11 renamed to tests_e2e/references/reference_docker-alpine_linux.sh_l11 tests_e2e/references/reference_docker-alpine.sh_l11 renamed to tests_e2e/references/reference_docker-alpine_linux.sh_l11

@@ -42,15 +42,10 @@ Creating file in mounted volume...
 test-content-1234
 🟢 Execute 'Docker Run (docker-network)'
 PushNodeVisit: docker-network, execute: true
-Test 8: Network host mode
-Hostname: docker-desktop
+Linux
 🟢 Execute 'Docker Run (docker-pull-always)'
 PushNodeVisit: docker-pull-always, execute: true
-##[group]Pulling image 'alpine:latest'
-  Pulling from library/alpine
-  Digest: sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659
-  Status: Image is up to date for alpine:latest
-##[endgroup]Test 9: Pull always policy
+Test 9: Pull always policy
 🟢 Execute 'Docker Run (docker-special-chars)'
 PushNodeVisit: docker-special-chars, execute: true
 Test 10: Special chars test
@@ -59,32 +54,10 @@ Dollar: $HOME
 Backtick: `date`
 🟢 Execute 'Docker Run (docker-dockerfile-relative)'
 PushNodeVisit: docker-dockerfile-relative, execute: true
-##[group]Building image 'actrun-docker-[REDACTED]' from [REDACTED]/Dockerfile.test
-Step 1/3 : FROM alpine:latest
- ---> 25109184c71b
-Step 2/3 : ENV MY_BUILD_VAR=default_build_value
- ---> Using cache
- ---> fde5e8900876
-Step 3/3 : WORKDIR [REDACTED]/app
- ---> Using cache
- ---> f6d5f9a2f2a5
-Successfully built f6d5f9a2f2a5
-Successfully tagged actrun-docker-[REDACTED]:latest
-##[endgroup]Test 11: Built from local Dockerfile (relative path)
+Test 11: Built from local Dockerfile (relative path)
 🟢 Execute 'Docker Run (docker-dockerfile-custom)'
 PushNodeVisit: docker-dockerfile-custom, execute: true
-##[group]Building image 'actrun-docker-[REDACTED]' from [REDACTED]/Dockerfile.test
-Step 1/3 : FROM alpine:latest
- ---> 25109184c71b
-Step 2/3 : ENV MY_BUILD_VAR=default_build_value
- ---> Using cache
- ---> fde5e8900876
-Step 3/3 : WORKDIR [REDACTED]/app
- ---> Using cache
- ---> f6d5f9a2f2a5
-Successfully built f6d5f9a2f2a5
-Successfully tagged actrun-docker-[REDACTED]:latest
-##[endgroup]Test 12: Dockerfile with env and workdir
+Test 12: Dockerfile with env and workdir
 MY_BUILD_VAR=from_dockerfile_build
 Working dir: [REDACTED]/opt
 🟢 Execute 'Docker Run (docker-volume-readonly)'
@@ -109,36 +82,15 @@ banana
 🟢 Execute 'Docker Run (docker-network-none)'
 PushNodeVisit: docker-network-none, execute: true
 Test 16: Network none (isolated)
-1
+Linux
 🟢 Execute 'Docker Run (docker-env-special)'
 PushNodeVisit: docker-env-special, execute: true
 Test 17: Env vars with spaces/special chars
 SPACE_VAR=hello world with spaces
 SPECIAL_VAR=a=b&c=d!@#
 🟢 Execute 'Docker Run (docker-default-cmd)'
 PushNodeVisit: docker-default-cmd, execute: true
-
-Hello from Docker!
-This message shows that your installation appears to be working correctly.
-
-To generate this message, Docker took the following steps:
- 1. The Docker client contacted the Docker daemon.
- 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-    (amd64)
- 3. The Docker daemon created a new container from that image which runs the
-    executable that produces the output you are currently reading.
- 4. The Docker daemon streamed that output to the Docker client, which sent it
-    to your terminal.
-
-To try something more ambitious, you can run an Ubuntu container with:
- $ docker run -it ubuntu bash
-
-Share images, automate workflows, and more with a free Docker ID:
- https:[REDACTED]/
-
-For more examples and ideas, visit:
- https:[REDACTED]/
-
+Hello World
 🟢 Execute 'Docker Run (docker-exit-nonzero)'
 PushNodeVisit: docker-exit-nonzero, execute: true
 Test 19: Non-zero exit code
@@ -157,15 +109,4 @@ Iteration 5
 PushNodeVisit: docker-dockerfile-absolute, execute: true
 PushNodeVisit: core-filepath-join-v1-pink-hippopotamus-fig, execute: false
 PushNodeVisit: core-filepath-location-v1-date-turquoise-teal, execute: false
-##[group]Building image 'actrun-docker-[REDACTED]' from [REDACTED]/Dockerfile.test
-Step 1/3 : FROM alpine:latest
- ---> 25109184c71b
-Step 2/3 : ENV MY_BUILD_VAR=default_build_value
- ---> Using cache
- ---> fde5e8900876
-Step 3/3 : WORKDIR [REDACTED]/app
- ---> Using cache
- ---> f6d5f9a2f2a5
-Successfully built f6d5f9a2f2a5
-Successfully tagged actrun-docker-[REDACTED]:latest
-##[endgroup]Test 21: Absolute path Dockerfile
+Test 21: Absolute path Dockerfile

tests_e2e/references/reference_docker-hello-world.sh_l8

@@ -0,0 +1,19 @@
+build hasn't expired yet
+looking for value: 'env_file'
+  no value (is optional) found for: 'env_file'
+looking for value: 'config_file'
+  no value (is optional) found for: 'config_file'
+looking for value: 'concurrency'
+  no value (is optional) found for: 'concurrency'
+looking for value: 'graph_file'
+  found value in: 'env (shell)'
+  evaluated to: 'docker-hello-world.act'
+looking for value: 'session_token'
+  no value (is optional) found for: 'session_token'
+looking for value: 'create_debug_session'
+  found value in flags
+  evaluated to: 'false'
+PushNodeVisit: start, execute: true
+🟢 Execute 'Docker Run (docker-hello-world)'
+PushNodeVisit: docker-hello-world, execute: true
+Hello World

tests_e2e/references/reference_docker-hello-world_linux.sh_l8

@@ -0,0 +1,3 @@
+FROM alpine:latest
+RUN echo "Built from local Dockerfile!"
+CMD ["echo", "Default CMD from Dockerfile"]

tests_e2e/scripts/Dockerfile.e2e

@@ -130,8 +130,7 @@ nodes:
       args:
         - '-c'
         - |
-          echo "Test 8: Network host mode"
-          echo "Hostname: $(hostname)"
+          uname -s
       entrypoint:
         - /bin/sh
       network: host
@@ -175,7 +174,7 @@ nodes:
       x: 5330
       y: 1480
     inputs:
-      image: Dockerfile.test
+      image: Dockerfile.e2e
       args:
         - '-c'
         - echo "Test 11: Built from local Dockerfile (relative path)"
@@ -188,7 +187,7 @@ nodes:
       x: 5830
       y: 1320
     inputs:
-      image: ./Dockerfile.test
+      image: ./Dockerfile.e2e
       args:
         - '-c'
         - |
@@ -276,13 +275,9 @@ nodes:
       image: docker://alpine:latest
       args:
         - '-c'
-        - >
+        - |
           echo "Test 16: Network none (isolated)"
-
-          # Check if network interfaces are minimal
-
-          ip link show 2>/dev/null | grep -c "^[0-9]" || echo "No ip command,
-          but that's ok"
+          uname -s
       entrypoint:
         - /bin/sh
       network: none
@@ -314,7 +309,10 @@ nodes:
       x: 8890
       y: 480
     inputs:
-      image: docker://hello-world:latest
+      image: docker://alpine:latest
+      args:
+        - echo
+        - Hello World
       pull: missing
       docker_socket: true
   - id: docker-exit-nonzero
@@ -391,7 +389,7 @@ nodes:
       y: 30
     inputs:
       segments[0]: null
-      segments[1]: Dockerfile.test
+      segments[1]: Dockerfile.e2e
 connections:
   - src:
       node: core-filepath-location-v1-date-turquoise-teal

tests_e2e/scripts/docker-alpine.act

@@ -2,9 +2,9 @@ echo "Test Docker-Run Alpine Node"
 
 TEST_NAME=docker-alpine
 GRAPH_FILE="${ACT_GRAPH_FILES_DIR}${PATH_SEPARATOR}${TEST_NAME}.act"
-DOCKERFILE="${ACT_GRAPH_FILES_DIR}${PATH_SEPARATOR}Dockerfile.test"
+DOCKERFILE="${ACT_GRAPH_FILES_DIR}${PATH_SEPARATOR}Dockerfile.e2e"
 cp $GRAPH_FILE $TEST_NAME.act
-cp $DOCKERFILE Dockerfile.test
+cp $DOCKERFILE Dockerfile.e2e
 
 export ACT_GRAPH_FILE=$TEST_NAME.act
 

tests_e2e/scripts/docker-alpine.sh tests_e2e/scripts/docker-alpine_linux.shtests_e2e/scripts/docker-alpine.sh renamed to tests_e2e/scripts/docker-alpine_linux.sh

@@ -11,7 +11,10 @@ nodes:
       x: 300
       y: 0
     inputs:
-      image: docker://hello-world:latest
+      image: docker://alpine:latest
+      args:
+        - echo
+        - Hello World
       pull: missing
       docker_socket: true
 connections: []