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

Add gitlab pipeline and remove plus building from github #1601

Merged
merged 1 commit into from
May 21, 2021

Conversation

ciarams87
Copy link
Member

Proposed changes

Remove plus building from GitHub; remove some of the CI logic from the workflows to the test folder; add a gitlab-ci.yml file for the Gitlab integration,

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@github-actions github-actions bot added the chore Pull requests for routine tasks label May 17, 2021
@ciarams87 ciarams87 force-pushed the chore/create-gitlab-pipeline branch 3 times, most recently from fd3c506 to 6703ad7 Compare May 18, 2021 20:43
@ciarams87 ciarams87 changed the title WIP: Remove plus building from github, and add required dependencies Add gitlab pipeline and remove plus building from github May 18, 2021
Copy link
Member

@lucacome lucacome 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 not sure about having edge and nightly in the same file, I think it makes it harder to read. I don't see less duplicated code as you mentioned? It's only the Build binary step?

needs: [binary, unit-tests]
if:
github.event.pull_request.head.repo.full_name == 'nginxinc/kubernetes-ingress' ||
Copy link
Member

Choose a reason for hiding this comment

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

Wasn't this here to prevent builds from forks? We don't need it anymore?

Copy link
Member Author

@ciarams87 ciarams87 May 19, 2021

Choose a reason for hiding this comment

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

As far as I recall, we wanted to skip smoke tests from forks because they couldn't access secrets. We're not using secrets here any more, so smoke tests on OSS is probably a good idea before we review anything.

tests/docker/Dockerfile Outdated Show resolved Hide resolved
@lucacome
Copy link
Member

I've noticed that the link to the pipeline doesn't bring you directly to the run if gitlab needs to reauthenticate, but works fine after that. We should report a bug 😄

@ciarams87

This comment has been minimized.

@ciarams87 ciarams87 force-pushed the chore/create-gitlab-pipeline branch 3 times, most recently from 71f0e1e to b6eee90 Compare May 20, 2021 12:19
- os: ubuntu-20.04
image: debian-plus
tag: ${{ github.sha }}
- image: alpine
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we run all tests on debian only? because of runs-on: ubuntu-20.04?

Copy link
Member Author

Choose a reason for hiding this comment

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

runs-on: ubuntu-20.04 is the just the runner OS - we always used ubuntu-20.04 runner for all of our jobs. The image is which IC image version we are using in the KinD cluster.

.github/workflows/edge.yml Outdated Show resolved Hide resolved
.github/workflows/edge.yml Outdated Show resolved Hide resolved
@@ -0,0 +1,7 @@
kind: Cluster
Copy link
Contributor

Choose a reason for hiding this comment

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

is this going outside of pipleines?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's so we are using the same configuration in github and gitlab

@@ -0,0 +1,14 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above

Copy link
Member Author

Choose a reason for hiding this comment

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

Same answer as above 👍🏼

@ciarams87 ciarams87 force-pushed the chore/create-gitlab-pipeline branch 2 times, most recently from ac23bc5 to 7a6babf Compare May 21, 2021 08:23
@ciarams87 ciarams87 force-pushed the chore/create-gitlab-pipeline branch from 7a6babf to e134841 Compare May 21, 2021 08:36
@@ -362,70 +254,15 @@ jobs:
path: ${{ github.workspace }}/tests/tests-${{ steps.k8s.outputs.cluster }}.html
if: always()

Copy link
Contributor

Choose a reason for hiding this comment

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

So much removed! Brilliant!

@ciarams87 ciarams87 merged commit 0e63d59 into master May 21, 2021
@ciarams87 ciarams87 deleted the chore/create-gitlab-pipeline branch May 21, 2021 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Pull requests for routine tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants