fix: remove the condition to build image (tkestack#881)

Co-authored-by: jiayongfei <[email protected]>
eshao731 · Nov 4, 2020 · 5ba7897 · 5ba7897
1 parent e96f318
commit 5ba7897
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -27,7 +27,7 @@ jobs:
  - name: checkout
  uses: actions/checkout@v2
  - name: build and push platform image
- if: contains(toJson(github.event.pull_request.labels.*.name), 'platform')
+# if: contains(toJson(github.event.pull_request.labels.*.name), 'platform')
  run: |
  make push IMAGES="tke-platform-api tke-platform-controller" VERSION=${{ github.sha }}
  platform1:

diff --git a/test/e2e/platform/platform_test.go b/test/e2e/platform/platform_test.go
@@ -370,7 +370,7 @@ func waitClusterToBeRunning(clusterName string) (cluster *platformv1.Cluster, er
 }
 
 func addNode(clusterName string, workerNode cloudprovider.Instance) (machine *platformv1.Machine, err error) {
- klog.Info("Add node. InstanceId: ", workerNode.InstanceID, ", PublicIP: ", workerNode.PublicIP, ", InternalIP: ", workerNode.InternalIP)
+ klog.Info("Add node. InstanceId: ", workerNode.InstanceID, ", InternalIP: ", workerNode.InternalIP)
  machine = &platformv1.Machine{
  Spec: platformv1.MachineSpec{
  ClusterName: clusterName,

diff --git a/test/e2e/tke/tke.go b/test/e2e/tke/tke.go
@@ -44,6 +44,8 @@ import (
  "tkestack.io/tke/test/util/env"
 )
 
+const TIMEOUT = 10 * time.Minute
+
 func tkeHostName() string {
  restconf := testclient.GetRESTConfig()
  host := restconf.Host
@@ -156,7 +158,7 @@ func (t *TKE) createEtcd(ctx context.Context) error {
  if err != nil {
  return err
  }
- return wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
+ return wait.PollImmediate(5*time.Second, TIMEOUT, func() (bool, error) {
  ok, err := apiclient.CheckPodReadyWithLabel(context.Background(), t.client, t.Namespace, "app=etcd")
  if err != nil {
  return false, nil
@@ -178,7 +180,7 @@ func (t *TKE) createPlatformAPI(ctx context.Context) error {
  return err
  }
 
- return wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
+ return wait.PollImmediate(5*time.Second, TIMEOUT, func() (bool, error) {
  ok, err := apiclient.CheckPodReadyWithLabel(context.Background(), t.client, t.Namespace, "app=tke-platform-api")
  if err != nil {
  return false, nil
@@ -201,7 +203,7 @@ func (t *TKE) createPlatformController(ctx context.Context) error {
  return err
  }
 
- return wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
+ return wait.PollImmediate(5*time.Second, TIMEOUT, func() (bool, error) {
  ok, err := apiclient.CheckPodReadyWithLabel(context.Background(), t.client, t.Namespace,
  "app=tke-platform-controller")
  if err != nil {

diff --git a/test/util/cloudprovider/tencent/tencent.go b/test/util/cloudprovider/tencent/tencent.go
@@ -97,7 +97,7 @@ func (p *provider) CreateInstances(count int64) ([]cloudprovider.Instance, error
  }
 
  for _, ins := range result {
- klog.Info("InstanceId: ", ins.InstanceID, ", PublicIP: ", ins.PublicIP, ", InternalIP: ", ins.InternalIP)
+ klog.Info("InstanceId: ", ins.InstanceID, ", InternalIP: ", ins.InternalIP)
  p.instanceIds = append(p.instanceIds, ins.InstanceID)
  }