Remove debug logging and fix CI pipeline

kubeshop · Sep 26, 2023 · 08ea6c5 · 08ea6c5
1 parent 7ab2573
commit 08ea6c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml
@@ -190,8 +190,7 @@ jobs:
           BOTKUBE_CLOUD_DEV_REFRESH_TOKEN: ${{ secrets.BOTKUBE_CLOUD_DEV_REFRESH_TOKEN }}
           BOTKUBE_CLOUD_DEV_AUTH0_CLIENT_ID: ${{ secrets.BOTKUBE_CLOUD_DEV_AUTH0_CLIENT_ID }}
         run: |
-          KUBECONFIG=$(k3d kubeconfig write cli-migration-e2e-cluster) \
-            make test-migration-tool
+          KUBECONFIG=$(k3d kubeconfig write cli-migration-e2e-cluster) make test-cli-migration-e2e
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
@@ -256,9 +255,8 @@ jobs:
           BOTKUBE_CLOUD_FREE_ORGANIZATION_ID: ${{ secrets.E2E_DEV_BOTKUBE_CLOUD_FREE_ORGANIZATION_ID }}
           SCREENSHOTS_DIR: ${{ runner.temp }}/screenshots
           DEBUG_MODE: true
-        run:
-          KUBECONFIG=$(k3d kubeconfig write cloud-slack-dev-e2e-cluster) \
-            make test-cloud-slack-dev-e2e
+        run: |
+          KUBECONFIG=$(k3d kubeconfig write cli-migration-e2e-cluster) make test-cloud-slack-dev-e2e
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ test-integration-slack: system-check
 test-integration-discord: system-check
 	@go test -v -tags=integration -race -count=1 ./test/e2e/... -run "TestDiscord"
 
-test-migration-tool: system-check
+test-cli-migration-e2e: system-check
 	@go test -v -tags=migration -race -count=1 ./test/e2e/...
 
 test-cloud-slack-dev-e2e: system-check

diff --git a/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go b/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go
@@ -567,11 +567,6 @@ func newBrowserPage(t *testing.T, browser *rod.Browser, cfg E2ESlackConfig) *rod
 }
 
 func removeSourcesAndAddActions(t *testing.T, gql *graphql.Client, existingDeployment *gqlModel.Deployment) *gqlModel.Deployment {
-	existingDeployment.HelmCommand = nil
-	existingDeployment.InstallUpgradeInstructions = nil
-	existingDeployment.APIKey = nil
-	formatx.StructDumper().Dump("Deployment before update", existingDeployment)
-	formatx.StructDumper().Dump("Deployment platforms before update", existingDeployment.Platforms)
 	var updateInput struct {
 		UpdateDeployment gqlModel.Deployment `graphql:"updateDeployment(id: $id, input: $input)"`
 	}
@@ -619,8 +614,6 @@ func removeSourcesAndAddActions(t *testing.T, gql *graphql.Client, existingDeplo
 		})
 	}
 
-	formatx.StructDumper().Dump("Deployment platforms after update", platforms)
-
 	updateVariables := map[string]interface{}{
 		"id": graphql.ID(existingDeployment.ID),
 		"input": gqlModel.DeploymentUpdateInput{
@@ -634,10 +627,6 @@ func removeSourcesAndAddActions(t *testing.T, gql *graphql.Client, existingDeplo
 	err := gql.Mutate(context.Background(), &updateInput, updateVariables)
 	require.NoError(t, err)
 
-	updateInput.UpdateDeployment.HelmCommand = nil
-	updateInput.UpdateDeployment.InstallUpgradeInstructions = nil
-	updateInput.UpdateDeployment.APIKey = nil
-	formatx.StructDumper().Dump("Deployment after update", updateInput.UpdateDeployment)
 	return &updateInput.UpdateDeployment
 }