Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Use factored out testing lib #5231

Merged
merged 27 commits into from
Jun 6, 2018
Merged

Conversation

unguiculus
Copy link
Member

@unguiculus unguiculus commented Apr 24, 2018

Updates CI to use refactored testing library.

Fixes #3772
Fixes #3579

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 24, 2018
@unguiculus unguiculus force-pushed the feature/testing branch 11 times, most recently from ef84444 to 518d41a Compare April 24, 2018 19:20
@unguiculus unguiculus changed the title wip [WIP][CI] Use factored out testing lib Apr 24, 2018
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 24, 2018
@unguiculus
Copy link
Member Author

Based on helm/chart-testing#1

@unguiculus
Copy link
Member Author

cc @kubernetes/charts-maintainers


wget -q ${HELM_URL}/${HELM_TARBALL} -P ${WORKSPACE}
tar xzfv ${WORKSPACE}/${HELM_TARBALL} -C ${WORKSPACE}
wget -q "$HELM_URL/$HELM_TARBALL" -P "$WORKSPACE"
Copy link
Collaborator

Choose a reason for hiding this comment

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

should this be packaged in the docker image?

Copy link
Member Author

Choose a reason for hiding this comment

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

This script is for tests of a few whitelisted charts against Kubernetes master. It is not used in regular charts CI. I did not really do anything with that other than making ShellCheck happy. This should probably be tackled in a separate PR.

command: test/circle/lint.sh
build:
docker:
- image: unguiculus/chart-testing
Copy link
Collaborator

Choose a reason for hiding this comment

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

please pin a docker version

Copy link
Collaborator

Choose a reason for hiding this comment

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

could you also add the source of this docker image in the git repo?

Copy link
Collaborator

Choose a reason for hiding this comment

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

never mind, I found it in the PR

Copy link
Member Author

Choose a reason for hiding this comment

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

The image will be updated to gcr.io/kubernetes-charts-ci/test-image:v2.0.0 before the PR is merged.

@@ -27,19 +27,10 @@ The configuration of the Pull Request trigger is [in the config.json](https://gi

This snippet tells Test Infra to run the [test/e2e.sh](https://github.com/kubernetes/charts/blob/master/test/e2e.sh)
when testing is triggered on a pull request. The e2e.sh script will use the [Charts test image](https://github.com/kubernetes/charts/blob/master/test/Dockerfile)
to run the [test/changed.sh](https://github.com/kubernetes/charts/blob/master/test/changed.sh) script. This script
to run the [chart_test.sh](https://github.com/kubernetes-helm/chart-testing/blob/master/chart_test.sh) script. This script
Copy link
Collaborator

Choose a reason for hiding this comment

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

this chart_test.sh link is broken

Copy link
Member Author

Choose a reason for hiding this comment

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

The links should work once helm/chart-testing#1 is merged.

@unguiculus
Copy link
Member Author

/assign @mattfarina @viglesiasce

@timstoop
Copy link
Contributor

I think it still needs helm/chart-testing#1 to be merged before this one can be?

@unguiculus unguiculus force-pushed the feature/testing branch 4 times, most recently from 46c4bab to 8a41c2d Compare May 31, 2018 10:48
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 31, 2018
@unguiculus
Copy link
Member Author

CircleCI should become green once #5847 is merged.

Copy link
Contributor

@mattfarina mattfarina left a comment

Choose a reason for hiding this comment

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

On the whole this looks good. I still need to look at the charts testing repo.

test/Dockerfile Outdated
@@ -12,45 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM debian:8.5
FROM gcr.io/kubernetes-charts-ci/chart-testing:v1.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Where is the source for this FROM? It's under our control which is why I'm curious.

Side note, I'm starting to ponder Quay because of the container image security scanning.

Copy link
Member Author

@unguiculus unguiculus Jun 1, 2018

Choose a reason for hiding this comment

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

That's the image containing the new factored out testing stuff.

Copy link
Contributor

@mattfarina mattfarina left a comment

Choose a reason for hiding this comment

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

On the whole this looks good. I would like @viglesiasce or @prydonius to give it a thumbs up, too.

jobs:
- build
- lint-scripts
- lint-charts
Copy link
Contributor

Choose a reason for hiding this comment

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

Note: Since this name is changing from build the required tests for branch will need to change when this goes in.

@mattfarina
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattfarina, unguiculus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [mattfarina,unguiculus]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit cad8ca9 into helm:master Jun 6, 2018
or1can pushed a commit to or1can/charts that referenced this pull request Jul 10, 2018
* [WIP][CI] Use factored out testing lib

* Incorporate upstream changes

* Update Docker image for CircleCI

* Update Docker image

* Update Docker image

* Align with upstream changes

* Remove dummy chart and bump a few charts for testing

* Fix Dockerfile

* Align with upstream changes

* Add summary

* Update Chart.yaml

* Update Docker images

* Remove chart test bumps

* Align with upstream changes

* Bump some charts for testing

* Create v2.0.0

* Remove chart version bumps

* Revert repo-sync.sh in favor of helm#5847

* Bump image version

* Use latest chart testing image
voron pushed a commit to dysnix/helm-charts that referenced this pull request Sep 5, 2018
* [WIP][CI] Use factored out testing lib

* Incorporate upstream changes

* Update Docker image for CircleCI

* Update Docker image

* Update Docker image

* Align with upstream changes

* Remove dummy chart and bump a few charts for testing

* Fix Dockerfile

* Align with upstream changes

* Add summary

* Update Chart.yaml

* Update Docker images

* Remove chart test bumps

* Align with upstream changes

* Bump some charts for testing

* Create v2.0.0

* Remove chart version bumps

* Revert repo-sync.sh in favor of helm#5847

* Bump image version

* Use latest chart testing image

Signed-off-by: voron <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants