Merge pull request #25718 from soltysh/fix_validation

Fix minor bit to make oc validation possible & remove unused test files
openshift · Dec 7, 2020 · ee82ae0 · ee82ae0
2 parents 77a1568 + dceb390
commit ee82ae0
Show file tree

Hide file tree

Showing 29 changed files with 71 additions and 1,164 deletions.
diff --git a/Makefile b/Makefile
@@ -98,4 +98,4 @@ test: test-tools
 # $5 - output
 # It will generate targets {update,verify}-bindata-$(1) logically grouping them in unsuffixed versions of these targets
 # and also hooked into {update,verify}-generated for broader integration.
-$(call add-bindata,bindata,-ignore ".*\.(go|md)$\" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... test/integration/testdata,testextended,testdata,test/extended/testdata/bindata.go)
+$(call add-bindata,bindata,-ignore ".*\.(go|md)$\" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/...,testextended,testdata,test/extended/testdata/bindata.go)
diff --git a/examples/sample-app/application-template-dockerbuild.json b/examples/sample-app/application-template-dockerbuild.json
@@ -293,8 +293,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     },
     {
       "kind": "Service",
@@ -413,8 +412,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     }
   ],
   "parameters": [

diff --git a/examples/sample-app/application-template-pullspecbuild.json b/examples/sample-app/application-template-pullspecbuild.json
@@ -278,8 +278,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     },
     {
       "kind": "Service",
@@ -448,8 +447,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     }
   ],
   "parameters": [

diff --git a/examples/sample-app/application-template-stibuild.json b/examples/sample-app/application-template-stibuild.json
@@ -288,8 +288,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     },
     {
       "kind": "Service",
@@ -458,8 +457,7 @@
             "dnsPolicy": "ClusterFirst"
           }
         }
-      },
-      "status": {}
+      }
     }
   ],
   "parameters": [

diff --git a/test/extended/builds/digest.go b/test/extended/builds/digest.go
@@ -14,7 +14,7 @@ import (
 var _ = g.Describe("[sig-builds][Feature:Builds][Slow] completed builds should have digest of the image in their status", func() {
 	defer g.GinkgoRecover()
 	var (
-		imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
+		imageStreamFixture = exutil.FixturePath("testdata", "builds", "test-image-stream.json")
 		stiBuildFixture    = exutil.FixturePath("testdata", "builds", "test-s2i-build.json")
 		dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build.json")
 		oc                 = exutil.NewCLI("build-sti-labels")

diff --git a/test/extended/builds/labels.go b/test/extended/builds/labels.go
@@ -14,7 +14,7 @@ import (
 var _ = g.Describe("[sig-builds][Feature:Builds] result image should have proper labels set", func() {
 	defer g.GinkgoRecover()
 	var (
-		imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
+		imageStreamFixture = exutil.FixturePath("testdata", "builds", "test-image-stream.json")
 		stiBuildFixture    = exutil.FixturePath("testdata", "builds", "test-s2i-build.json")
 		dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build.json")
 		oc                 = exutil.NewCLI("build-sti-labels")

diff --git a/test/extended/builds/s2i_env.go b/test/extended/builds/s2i_env.go
@@ -22,7 +22,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] s2i build with environmen
 	)
 
 	var (
-		imageStreamFixture   = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
+		imageStreamFixture   = exutil.FixturePath("testdata", "builds", "test-image-stream.json")
 		stiEnvBuildFixture   = exutil.FixturePath("testdata", "builds", "test-env-build.json")
 		podAndServiceFixture = exutil.FixturePath("testdata", "builds", "test-build-podsvc.json")
 		oc                   = exutil.NewCLI("build-sti-env")

diff --git a/test/extended/cmd.sh b/test/extended/cmd.sh
@@ -161,7 +161,7 @@ os::cmd::expect_success "oc set volumes dc/nginx --add --configmap-name=default-
 os::cmd::try_until_text "oc get pods -l deployment-config.name=nginx" 'Running'
 
 # only show single pods in status if they are really single
-os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'
+os::cmd::expect_success 'oc create -f test/extended/testdata/test-deployment-config.yaml'
 os::cmd::try_until_text 'oc status' 'dc\/test-deployment-config deploys docker\.io\/openshift\/origin-pod:latest' "$(( 2 * TIME_MIN ))"
 os::cmd::try_until_text 'oc status' 'deployment #1 deployed.*- 1 pod' "$(( 2 * TIME_MIN ))"
 os::cmd::expect_success_and_not_text 'oc status' 'pod\/test-deployment-config-1-[0-9a-z]{5} runs openshift\/origin-pod'