Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: upgrade e2e-test-ci #1149

Merged
merged 14 commits into from
Jul 18, 2022
Merged

ci: upgrade e2e-test-ci #1149

merged 14 commits into from
Jul 18, 2022

Conversation

AlinsRan
Copy link
Contributor

@AlinsRan AlinsRan commented Jul 13, 2022

Type of change:

  • Bugfix
  • New feature provided
  • Improve performance
  • Backport patches

What this PR does / why we need it:

ref: #1164

  • Add retry mechanism to reduce random errors.
  • Fix the wrong operation of e2e using EnsureNum... func to ensure resource update.
  • Ci reuses the built image, which has reduced the build time of the job.

It will retry 6 times to ensure the stability above 80%

  • 1th - pass
  • 2th - pass
  • 3th - pass
  • 4th - pass
  • 5th - pass
  • done

retry 6 times:
pass: 6
faild: 0

@codecov-commenter
Copy link

codecov-commenter commented Jul 13, 2022

Codecov Report

Merging #1149 (8e50353) into master (35ca03c) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1149   +/-   ##
=======================================
  Coverage   30.45%   30.45%           
=======================================
  Files          81       81           
  Lines        9839     9839           
=======================================
  Hits         2996     2996           
  Misses       6517     6517           
  Partials      326      326           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 35ca03c...8e50353. Read the comment docs.

@AlinsRan AlinsRan force-pushed the ci/e2e branch 16 times, most recently from ed2024a to ac3bb93 Compare July 13, 2022 09:42
@AlinsRan AlinsRan marked this pull request as ready for review July 15, 2022 08:54
@AlinsRan AlinsRan changed the title ci: upgrade e2e-test ci: upgrade e2e-test-ci Jul 15, 2022
@AlinsRan AlinsRan mentioned this pull request Jul 15, 2022
2 tasks
Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing it's because there are places in the code that need to be marked with their image tags?

Comment on lines +80 to +98
docker tag apache/apisix:2.13.1-alpine $(REGISTRY)/apache/apisix:$(IMAGE_TAG)

docker pull bitnami/etcd:3.4.14-debian-10-r0
docker tag bitnami/etcd:3.4.14-debian-10-r0 $(REGISTRY)/bitnami/etcd:$(IMAGE_TAG)

docker pull kennethreitz/httpbin
docker tag kennethreitz/httpbin $(REGISTRY)/kennethreitz/httpbin:$(IMAGE_TAG)

docker build -t test-backend:$(IMAGE_TAG) --build-arg ENABLE_PROXY=$(ENABLE_PROXY) ./test/e2e/testbackend
docker tag test-backend:$(IMAGE_TAG) $(REGISTRY)/test-backend:$(IMAGE_TAG)

docker build -t apache/apisix-ingress-controller:$(IMAGE_TAG) --build-arg ENABLE_PROXY=$(ENABLE_PROXY) .
docker tag apache/apisix-ingress-controller:$(IMAGE_TAG) $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)

docker pull jmalloc/echo-server:latest
docker tag jmalloc/echo-server:latest $(REGISTRY)/jmalloc/echo-server:$(IMAGE_TAG)

docker pull busybox:1.28
docker tag busybox:1.28 $(REGISTRY)/busybox:$(IMAGE_TAG)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not recommend unifying the tags of these images into dev.
If the task fails, we need to check the code to know which image is used.

Can you explain your benefit of unifying them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The advantage of this is that because we use a local repository, we don't need to care about these images tags in the code. When upgrading, we only need to change the Makefile file.
At present, localhost:5000 is used to identify the local warehouse in our code. It's not difficult to track this problem.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense, let's move forward.

@tao12345666333 tao12345666333 added this to the 1.5.0 milestone Jul 18, 2022
@tao12345666333 tao12345666333 merged commit 628abb9 into apache:master Jul 18, 2022
@AlinsRan AlinsRan deleted the ci/e2e branch July 29, 2022 04:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants