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

[stable-5] Backport rds_instance test changes #1324

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 9, 2023

SUMMARY

Manual backport of various PRs:
#1185
#1239
#1238
#1258 (partial)
#1245 (partial)

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

rds_instance

ADDITIONAL INFORMATION

goneri and others added 5 commits January 9, 2023 09:13
rds_instance: split up the integration tests

Split the rds_instance target in smaller targets.

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Gonéri Le Bouder <[email protected]>
…lections#1239)

rds_instance_aurora/tests: increase the max job duration

Reviewed-by: Mark Chappell <None>
Bump MariaDB versions for RDS tests

MariaDB 10.3.31 is not available anymore. This results in the following exception:
botocore.exceptions.ClientError: An error occurred (InvalidParameterCombination) when calling the CreateDBInstance operation: Cannot find version 10.3.31 for mariadb

To get a list of the version available:
$ aws rds describe-db-engine-versions --engine mariadb --query "DBEngineVersions[].EngineVersion"
…-collections#1258)

Replace 'slow' with time approximations from periodic builds

SUMMARY
Replace 'slow' with time approximations from periodic builds
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
tests/integration/targets/elb_application_lb/aliases
tests/integration/targets/elb_classic_lb/aliases
tests/integration/targets/rds_instance_snapshot/aliases
ADDITIONAL INFORMATION
More integration test timing

SUMMARY
ec2_eip is unstable
rds_instance_states is taking longer with the new DB type.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
tests/integration
ADDITIONAL INFORMATION
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

✔️ ansible-galaxy-importer SUCCESS in 4m 21s
✔️ build-ansible-collection SUCCESS in 5m 04s
ansible-test-sanity-aws-ansible-python38 FAILURE in 9m 43s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 10m 11s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 8m 59s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 9m 47s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 6m 21s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 6m 36s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 6m 05s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 6m 45s
✔️ cloud-tox-py3 SUCCESS in 3m 04s
✔️ ansible-test-changelog SUCCESS in 2m 12s
✔️ ansible-test-splitter SUCCESS in 2m 33s
✔️ integration-amazon.aws-1 SUCCESS in 52m 44s
✔️ integration-amazon.aws-2 SUCCESS in 40m 47s
✔️ integration-amazon.aws-3 SUCCESS in 40m 07s
✔️ integration-amazon.aws-4 SUCCESS in 42m 20s
✔️ integration-amazon.aws-5 SUCCESS in 22m 21s
⚠️ integration-amazon.aws-6 SKIPPED
⚠️ integration-amazon.aws-7 SKIPPED
⚠️ integration-amazon.aws-8 SKIPPED
⚠️ integration-amazon.aws-9 SKIPPED
⚠️ integration-amazon.aws-10 SKIPPED
⚠️ integration-amazon.aws-11 SKIPPED
⚠️ integration-amazon.aws-12 SKIPPED
⚠️ integration-amazon.aws-13 SKIPPED
⚠️ integration-amazon.aws-14 SKIPPED
⚠️ integration-amazon.aws-15 SKIPPED
⚠️ integration-amazon.aws-16 SKIPPED
⚠️ integration-amazon.aws-17 SKIPPED
⚠️ integration-amazon.aws-18 SKIPPED
⚠️ integration-amazon.aws-19 SKIPPED
⚠️ integration-amazon.aws-20 SKIPPED
⚠️ integration-amazon.aws-21 SKIPPED
⚠️ integration-amazon.aws-22 SKIPPED
⚠️ integration-community.aws-1 SKIPPED
⚠️ integration-community.aws-2 SKIPPED
⚠️ integration-community.aws-3 SKIPPED
⚠️ integration-community.aws-4 SKIPPED
⚠️ integration-community.aws-5 SKIPPED
⚠️ integration-community.aws-6 SKIPPED
⚠️ integration-community.aws-7 SKIPPED
⚠️ integration-community.aws-8 SKIPPED
⚠️ integration-community.aws-9 SKIPPED
⚠️ integration-community.aws-10 SKIPPED
⚠️ integration-community.aws-11 SKIPPED
⚠️ integration-community.aws-12 SKIPPED
⚠️ integration-community.aws-13 SKIPPED
⚠️ integration-community.aws-14 SKIPPED
⚠️ integration-community.aws-15 SKIPPED
⚠️ integration-community.aws-16 SKIPPED
⚠️ integration-community.aws-17 SKIPPED
⚠️ integration-community.aws-18 SKIPPED
⚠️ integration-community.aws-19 SKIPPED
⚠️ integration-community.aws-20 SKIPPED
⚠️ integration-community.aws-21 SKIPPED
⚠️ integration-community.aws-22 SKIPPED

@tremble tremble requested a review from alinabuzachis January 9, 2023 09:52
@tremble tremble marked this pull request as ready for review January 9, 2023 09:52
@tremble tremble added the backport-4 PR should be backported to the stable-4 branch label Jan 9, 2023
@ansibullbot
Copy link

@ansibullbot ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration plugins plugin (any type) tests tests labels Jan 9, 2023
@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 9, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

✔️ ansible-galaxy-importer SUCCESS in 4m 09s
✔️ build-ansible-collection SUCCESS in 7m 14s
✔️ ansible-test-splitter SUCCESS in 2m 35s
✔️ integration-amazon.aws-1 SUCCESS in 49m 45s
✔️ integration-amazon.aws-2 SUCCESS in 41m 41s
✔️ integration-amazon.aws-3 SUCCESS in 42m 53s
✔️ integration-amazon.aws-4 SUCCESS in 43m 43s
✔️ integration-amazon.aws-5 SUCCESS in 23m 46s
⚠️ integration-amazon.aws-6 SKIPPED
⚠️ integration-amazon.aws-7 SKIPPED
⚠️ integration-amazon.aws-8 SKIPPED
⚠️ integration-amazon.aws-9 SKIPPED
⚠️ integration-amazon.aws-10 SKIPPED
⚠️ integration-amazon.aws-11 SKIPPED
⚠️ integration-amazon.aws-12 SKIPPED
⚠️ integration-amazon.aws-13 SKIPPED
⚠️ integration-amazon.aws-14 SKIPPED
⚠️ integration-amazon.aws-15 SKIPPED
⚠️ integration-amazon.aws-16 SKIPPED
⚠️ integration-amazon.aws-17 SKIPPED
⚠️ integration-amazon.aws-18 SKIPPED
⚠️ integration-amazon.aws-19 SKIPPED
⚠️ integration-amazon.aws-20 SKIPPED
⚠️ integration-amazon.aws-21 SKIPPED
⚠️ integration-amazon.aws-22 SKIPPED
⚠️ integration-community.aws-1 SKIPPED
⚠️ integration-community.aws-2 SKIPPED
⚠️ integration-community.aws-3 SKIPPED
⚠️ integration-community.aws-4 SKIPPED
⚠️ integration-community.aws-5 SKIPPED
⚠️ integration-community.aws-6 SKIPPED
⚠️ integration-community.aws-7 SKIPPED
⚠️ integration-community.aws-8 SKIPPED
⚠️ integration-community.aws-9 SKIPPED
⚠️ integration-community.aws-10 SKIPPED
⚠️ integration-community.aws-11 SKIPPED
⚠️ integration-community.aws-12 SKIPPED
⚠️ integration-community.aws-13 SKIPPED
⚠️ integration-community.aws-14 SKIPPED
⚠️ integration-community.aws-15 SKIPPED
⚠️ integration-community.aws-16 SKIPPED
⚠️ integration-community.aws-17 SKIPPED
⚠️ integration-community.aws-18 SKIPPED
⚠️ integration-community.aws-19 SKIPPED
⚠️ integration-community.aws-20 SKIPPED
⚠️ integration-community.aws-21 SKIPPED
⚠️ integration-community.aws-22 SKIPPED

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 7b574ff into ansible-collections:stable-5 Jan 9, 2023
@patchback
Copy link

patchback bot commented Jan 9, 2023

Backport to stable-4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 7b574ff on top of patchback/backports/stable-4/7b574ff533bbfdcc94dbbd60330e16b98e229603/pr-1324

Backporting merged PR #1324 into stable-5

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/amazon.aws.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4/7b574ff533bbfdcc94dbbd60330e16b98e229603/pr-1324 upstream/stable-4
  4. Now, cherry-pick PR [stable-5] Backport rds_instance test changes #1324 contents into that branch:
    $ git cherry-pick -x 7b574ff533bbfdcc94dbbd60330e16b98e229603
    If it'll yell at you with something like fatal: Commit 7b574ff533bbfdcc94dbbd60330e16b98e229603 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 7b574ff533bbfdcc94dbbd60330e16b98e229603
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [stable-5] Backport rds_instance test changes #1324 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4/7b574ff533bbfdcc94dbbd60330e16b98e229603/pr-1324
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@tremble tremble deleted the backport/stable-5/1185 branch February 15, 2023 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4 PR should be backported to the stable-4 branch community_review feature This issue/PR relates to a feature request integration tests/integration mergeit Merge the PR (SoftwareFactory) plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants