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

🏃extend ci-conformance.sh testing capability #617

Merged
merged 3 commits into from
May 18, 2020
Merged

🏃extend ci-conformance.sh testing capability #617

merged 3 commits into from
May 18, 2020

Conversation

chewong
Copy link
Member

@chewong chewong commented May 14, 2020

What this PR does / why we need it:
Extending ci-conformance.sh testing capability to allow other tests to be run on a CAPZ cluster - a temporary solution until kubernetes-sigs/cluster-api#2826 is fixed.

This PR created a modified version of ci-conformance.sh called ci-entrypoint.sh instead of directly re-naming ci-conformance.sh so we won't break any jobs temporarily (I will open a separate PR to delete duplicated files after all test configurations in test-infra point to ci-entrypoint.sh). ci-entrypoint.sh will be the new entrypoint for all E2E tests. It can accept k/k master branch or release branches, and has the option to run upstream E2E tests or bring your own E2E tests by appending custom commands to ./scripts/ci-entrypoint.sh.

An example of how this script will be used in test-infra to test in-tree Azure Disk driver:

...
  spec:
    containers:
    - image: gcr.io/k8s-testimages/kubekins-e2e:v20200509-be34c64-master
      command:
      - runner.sh
      - ./scripts/ci-entrypoint.sh
      - bash
      - -c
      - >-
        kubectl apply -f templates/addons/storageclass-azure-disk.yaml &&
        cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver &&
        make e2e-test
      env:
      - name: SKIP_UPSTREAM_E2E_TESTS
        value: "true"
      - name: USE_CI_ARTIFACTS
        value: "true"
...

/assign @CecileRobertMichon

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

🏃extend ci-conformance.sh testing compatibility 

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 14, 2020
@k8s-ci-robot k8s-ci-robot added area/provider/azure Issues or PRs related to azure provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 14, 2020
@chewong
Copy link
Member Author

chewong commented May 15, 2020

/retest

@CecileRobertMichon
Copy link
Contributor

/test ls

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-integration
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-verify
  • /test pull-cluster-api-provider-azure-conformance-v1alpha3

Use /test all to run all jobs.

In response to this:

/test ls

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@CecileRobertMichon
Copy link
Contributor

/test pull-cluster-api-provider-azure-conformance-v1alpha3

@CecileRobertMichon
Copy link
Contributor

/test pull-cluster-api-provider-azure-conformance-v1alpha3

@CecileRobertMichon
Copy link
Contributor

@chewong what about opening a test-infra PR to change the pull conformance job to point to ci-entrypoint.sh right now so we can test the new script in this PR? the pull conformance job optional and not run by default so it won't block other PRs

@chewong chewong changed the title 🏃extend ci-conformance.sh testing compatibility 🏃extend ci-conformance.sh testing capability May 15, 2020
@chewong
Copy link
Member Author

chewong commented May 15, 2020

/test pull-cluster-api-provider-azure-conformance-v1alpha3

@chewong
Copy link
Member Author

chewong commented May 15, 2020

/test pull-cluster-api-provider-azure-conformance-v1alpha3-master
/test pull-cluster-api-provider-azure-conformance-v1alpha3-1-18

@chewong
Copy link
Member Author

chewong commented May 15, 2020

/hold
Since the jobs are already pointing to ci-entrypoint.sh, let me directly rename ci-conformance.sh to ci-entrypoint.sh

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 15, 2020
@CecileRobertMichon
Copy link
Contributor

@chewong what about the periodic jobs? I think we need to merge this as-is before changing those

@chewong
Copy link
Member Author

chewong commented May 15, 2020

@chewong what about the periodic jobs? I think we need to merge this as-is before changing those

Ah right, we can merge this as-is and I will modify existing periodic jobs and add additional ones before removing ci-conformance.sh.

@chewong
Copy link
Member Author

chewong commented May 16, 2020

Oops I forgot to set USE_CI_ARTIFACTS to true in kubernetes/test-infra#17613. That's why pull-cluster-api-provider-azure-conformance-v1alpha3-1-18 and pull-cluster-api-provider-azure-conformance-v1alpha3-master are testing against 1.17.4 instead of master and 1.18. Let me open another PR in test-infra.

@chewong
Copy link
Member Author

chewong commented May 18, 2020

/test pull-cluster-api-provider-azure-conformance-v1alpha3-master
/test pull-cluster-api-provider-azure-conformance-v1alpha3-1-18

@chewong
Copy link
Member Author

chewong commented May 18, 2020

/test pull-cluster-api-provider-azure-conformance-v1alpha3-1-18

@chewong
Copy link
Member Author

chewong commented May 18, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2020
@chewong
Copy link
Member Author

chewong commented May 18, 2020

/test pull-cluster-api-provider-azure-conformance-v1alpha3-master
/test pull-cluster-api-provider-azure-conformance-v1alpha3-1-18

@chewong
Copy link
Member Author

chewong commented May 18, 2020

/retest

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 18, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, chewong

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:

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 18, 2020
@k8s-ci-robot k8s-ci-robot merged commit e0fd9de into kubernetes-sigs:master May 18, 2020
@k8s-ci-robot k8s-ci-robot added this to the v0.5 milestone May 18, 2020
@chewong chewong deleted the extend-ci-script branch May 19, 2020 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants