Skip to content

Inclusivity changes for CloudStack - change default git branch name from 'master' to 'main', and rename some offensive words/terms as appropriate - #4922

Closed
sureshanaparti wants to merge 13 commits into
apache:masterfrom
shapeblue:change-default-git-branch-name-from-master-to-main
Closed

Inclusivity changes for CloudStack - change default git branch name from 'master' to 'main', and rename some offensive words/terms as appropriate #4922
sureshanaparti wants to merge 13 commits into
apache:masterfrom
shapeblue:change-default-git-branch-name-from-master-to-main

Conversation

@sureshanaparti

@sureshanapartisureshanaparti commented Apr 15, 2021

Copy link
Copy Markdown
Contributor

Description

Inclusivity changes for CloudStack

  • Change default git branch name from 'master' to 'main' (post renaming/changing default git branch to 'main' in git repo)
  • Rename some offensive words/terms as appropriate for inclusiveness.

This PR updates the default git branch to 'main', as part of #4887.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Others - Git repo changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Comment threadCHANGES.md
@DaanHoogland

Copy link
Copy Markdown
Contributor

let's do this immediately after releasing 4.15.1 and before 4.16

@sureshanaparti
sureshanapartiforce-pushed the change-default-git-branch-name-from-master-to-main branch from 4c0ec27 to dfcebeaCompareApril 26, 2021 10:49
@sureshanapartisureshanaparti changed the title Change default git branch name from 'master' to 'main'Inclusivity changes for CloudStack - change default git branch name from 'master' to 'main', and rename some offensive words/terms as appropriate Apr 26, 2021
@sureshanaparti
sureshanapartiforce-pushed the change-default-git-branch-name-from-master-to-main branch from dfcebea to dc1915dCompareApril 26, 2021 11:02
@yadvryadvr mentioned this pull request Apr 26, 2021
5 tasks
@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@sureshanaparti
sureshanapartiforce-pushed the change-default-git-branch-name-from-master-to-main branch from dc1915d to 92aaba7CompareApril 27, 2021 05:38
@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 468

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-539)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36114 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t539-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 83 look OK, 5 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80Failure366.84test_internal_lb.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfacesError202.63test_internal_lb.py
test_04_rvpc_privategw_static_routesFailure949.85test_privategw_acl.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_trueFailure263.78test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure263.21test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure232.23test_vpc_redundant.py
test_02_redundant_VPC_default_routesFailure231.25test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersFailure148.92test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nicsFailure108.66test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure208.01test_vpc_redundant.py
test_05_rvpc_multi_tiersError234.89test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpnFailure281.46test_vpc_vpn.py

@DaanHooglandDaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I've gone through this and am impressed by the amount of work it must have been. I agree with all the changes and can not tell if there are any omissions we should consider. Let's merge this and stay vigilant. being inclusive should not depend on those we want to include but on those that potentially exclude. (remark-to-self as well as all others)

@nathanmcgarvey

nathanmcgarvey commented May 3, 2021

Copy link
Copy Markdown

Overall, and this is probably too late for this suggestion: I'd recommend breaking this out into multiple commits: this is a huge single commit which makes reverting, diffing, and really all repo maintenance hard.

Detailed suggestions:

  1. Carefully evaluate things things that are really version bump ideas that could break external API compatibility:
    E.g. systemvm/debian/opt/cloud/bin/master.py → systemvm/debian/opt/cloud/bin/router_mode.py
    a. Both the renaming of that file, and the changing of the command line arguments.
    b. tools/docker/systemtpl.sh I hope those URLs and files actually exist immediately after merge!

  2. Remove unrelated changes to this PR... don't just tailgate stuff onto an already huge commit:
    plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
    plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java
    test/integration/component/test_acl_listsnapshot.py partially (Non-relevant typos: ("Snapshotss"))

  3. Match internal terminology to other external project documentation:
    Examples:
    a. Instead of "backup/cloudBackup"... call "replica/cloudReplica" to line up with MySQL docs post 8.0.23 (Ref: https://dev.mysql.com/doc/refman/8.0/en/binlog-replication-configuration-overview.html)
    Found at least in these files:
    client/conf/db.properties.in
    framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
    .
    b. Instead of "Secondary" interface, which has a different meaning, how about "member" or maybe not even changing it quite yet since most OS documentation and Linux proper still actually calls them "slaves" in terms of Linux channel-bonding, by definition. This is going to get really confusing since if someone says 'secondary' interface, they usually mean a literal second NIC or alias, not a subordinate interface in a channel-bond/team/whatever.
    Found at least in these files:
    plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/NetworkTest.java
    scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh
    ...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

  4. There are missing corrections if you were trying to be 100% code-complete.
    Example:
    a. ...va/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java still has "slave" as a passed method parameter.

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

Overall, and this is probably too late for this suggestion: I'd recommend breaking this out into multiple commits: this is a huge single commit which makes reverting, diffing, and really all repo maintenance hard.

Detailed suggestions:

  1. Carefully evaluate things things that are really version bump ideas that could break external API compatibility:
    E.g. systemvm/debian/opt/cloud/bin/master.py → systemvm/debian/opt/cloud/bin/router_mode.py
    a. Both the renaming of that file, and the changing of the command line arguments.
    b. tools/docker/systemtpl.sh I hope those URLs and files actually exist immediately after merge!
  2. Remove unrelated changes to this PR... don't just tailgate stuff onto an already huge commit:
    plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
    plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java
    test/integration/component/test_acl_listsnapshot.py partially (Non-relevant typos: ("Snapshotss"))
  3. Match internal terminology to other external project documentation:
    Examples:
    a. Instead of "backup/cloudBackup"... call "replica/cloudReplica" to line up with MySQL docs post 8.0.23 (Ref: https://dev.mysql.com/doc/refman/8.0/en/binlog-replication-configuration-overview.html)
    Found at least in these files:
    client/conf/db.properties.in
    framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
    .
    b. Instead of "Secondary" interface, which has a different meaning, how about "member" or maybe not even changing it quite yet since most OS documentation and Linux proper still actually calls them "slaves" in terms of Linux channel-bonding, by definition. This is going to get really confusing since if someone says 'secondary' interface, they usually mean a literal second NIC or alias, not a subordinate interface in a channel-bond/team/whatever.
    Found at least in these files:
    plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/NetworkTest.java
    scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh
    ...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
  4. There are missing corrections if you were trying to be 100% code-complete.
    Example:
    a. ...va/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java still has "slave" as a passed method parameter.

@nathanmcgarvey Thanks for the review, I'll update the changes accordingly.

Comment threadapi/src/main/java/org/apache/cloudstack/api/ApiConstants.java Outdated
@sureshanaparti
sureshanapartiforce-pushed the change-default-git-branch-name-from-master-to-main branch from 92aaba7 to f2c3e87CompareMay 10, 2021 12:53
@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

Overall, and this is probably too late for this suggestion: I'd recommend breaking this out into multiple commits: this is a huge single commit which makes reverting, diffing, and really all repo maintenance hard.
Detailed suggestions:

  1. Carefully evaluate things things that are really version bump ideas that could break external API compatibility:
    E.g. systemvm/debian/opt/cloud/bin/master.py → systemvm/debian/opt/cloud/bin/router_mode.py
    a. Both the renaming of that file, and the changing of the command line arguments.
    b. tools/docker/systemtpl.sh I hope those URLs and files actually exist immediately after merge!
  2. Remove unrelated changes to this PR... don't just tailgate stuff onto an already huge commit:
    plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
    plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java
    test/integration/component/test_acl_listsnapshot.py partially (Non-relevant typos: ("Snapshotss"))
  3. Match internal terminology to other external project documentation:
    Examples:
    a. Instead of "backup/cloudBackup"... call "replica/cloudReplica" to line up with MySQL docs post 8.0.23 (Ref: https://dev.mysql.com/doc/refman/8.0/en/binlog-replication-configuration-overview.html)
    Found at least in these files:
    client/conf/db.properties.in
    framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
    .
    b. Instead of "Secondary" interface, which has a different meaning, how about "member" or maybe not even changing it quite yet since most OS documentation and Linux proper still actually calls them "slaves" in terms of Linux channel-bonding, by definition. This is going to get really confusing since if someone says 'secondary' interface, they usually mean a literal second NIC or alias, not a subordinate interface in a channel-bond/team/whatever.
    Found at least in these files:
    plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/NetworkTest.java
    scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh
    ...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
  4. There are missing corrections if you were trying to be 100% code-complete.
    Example:
    a. ...va/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java still has "slave" as a passed method parameter.

@nathanmcgarvey Thanks for the review, I'll update the changes accordingly.

@nathanmcgarvey I've split these changes across multiple commits, please take a look.
Regarding your suggestions.

  1. I have carefully checked the files that were renamed as part of this exercise. The file name references and any changes to the command line arguments are addressed, and the files exist immediately after merge.
  2. Removed unrelated changes in plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java, except the comments & typos: 'Snapshotss' at test/integration/component/test_acl_listsnapshot.py (minor changes and can forget to correct this later, so ignoring this).
  3. Updated the internal terminology to match with the other external / third party product documentation (MySQL source / replicas, XenSever pool master, etc).
  4. Corrected the missing parts. Removed the changes here plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java , to be in sync with XenSever pool master and slave.

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@yadvryadvr added this to the 4.16.0.0 milestone May 10, 2021

@yadvryadvr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Lgtm. This needs a round of test matrix and additional review.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 570

@nathanmcgarvey

nathanmcgarvey commented May 11, 2021

Copy link
Copy Markdown

Visually LGTM. I did no functional, smoke, or any other actual technical testing.

Side-note: @sureshanaparti , that was a crazy-fast revision.

@yadvr

Copy link
Copy Markdown
Member

@sureshanaparti can you kick test matrix and ensure all build/tests are passing

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan test matrix

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-865)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44415 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t865-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 87 look OK, 1 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure627.91test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersFailure663.56test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure554.85test_vpc_redundant.py
test_05_rvpc_multi_tiersError554.86test_vpc_redundant.py

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-863)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 58850 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t863-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_accounts.py
Intermittent failure detected: /marvin/tests/smoke/test_affinity_groups_projects.py
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 84 look OK, 4 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
ContextSuite context=TestAccounts>:setupError0.00test_accounts.py
ContextSuite context=TestAddVmToSubDomain>:setupError0.00test_accounts.py
test_DeleteDomainError4.09test_accounts.py
test_forceDeleteDomainFailure3.97test_accounts.py
ContextSuite context=TestRemoveUserFromAccount>:setupError5.34test_accounts.py
ContextSuite context=TestDeployVmWithAffinityGroup>:setupError0.00test_affinity_groups_projects.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_trueFailure364.19test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure364.21test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure617.46test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersFailure528.44test_vpc_redundant.py

@yadvr

yadvr commented Jun 5, 2021

Copy link
Copy Markdown
Member

@blueorangutan test centos7 xenserver-71

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-867)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42693 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t867-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 85 look OK, 3 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_trueFailure378.89test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure369.81test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure603.86test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLError603.88test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersFailure526.30test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure527.11test_vpc_redundant.py
test_05_rvpc_multi_tiersError527.12test_vpc_redundant.py
test_02_cancel_host_maintenace_with_migration_jobsError1320.67test_host_maintenance.py
test_03_cancel_host_maintenace_with_migration_jobs_failureError0.16test_host_maintenance.py

@yadvr

yadvr commented Jun 6, 2021

Copy link
Copy Markdown
Member

@blueorangutan test centos7 xenserver-71

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-877)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44800 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t877-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 86 look OK, 2 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure363.54test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure593.44test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersFailure445.72test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure563.38test_vpc_redundant.py

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan test centos7 vmware-67u3

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

@yadvr

yadvr commented Jun 7, 2021

Copy link
Copy Markdown
Member

@sureshanaparti can you check if the intermittently failing VR/network tests are caused by this PR?

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-878)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 67108 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t878-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_storage_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 79 look OK, 9 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File
ContextSuite context=TestVMWareStoragePolicies>:setupError0.00test_storage_policy.py
test_02_create_template_with_checksum_sha1Error65.51test_templates.py
test_03_create_template_with_checksum_sha256Error65.37test_templates.py
test_04_create_template_with_checksum_md5Error75.21test_templates.py
test_05_create_template_with_no_checksumError65.44test_templates.py
test_04_extract_templateFailure200.14test_templates.py
ContextSuite context=TestISOUsage>:setupError0.00test_usage.py
test_01_volume_usageFailure672.46test_usage.py
ContextSuite context=TestVAppsVM>:setupError1561.50test_vm_life_cycle.py
test_10_attachAndDetach_isoFailure1510.24test_vm_life_cycle.py
test_change_service_offering_for_vm_with_snapshotsError219.34test_vm_snapshots.py
ContextSuite context=TestVolumes>:setupError1967.42test_volumes.py
ContextSuite context=TestVPCRedundancy>:setupError0.00test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setupError0.00test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setupError0.00test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setupError0.00test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setupError0.00test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setupError0.00test_vpc_vpn.py

@yadvr

yadvr commented Jun 7, 2021

Copy link
Copy Markdown
Member

@blueorangutan test centos7 vmware-67u3

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@sureshanaparti can you check if the intermittently failing VR/network tests are caused by this PR?

@rhtyd these test failures are related to some network connectivity issues, and not related to this PR changes.

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

Trillian test result (tid-877)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44800 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t877-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 86 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 363.54 test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 593.44 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 445.72 test_vpc_redundant.py
test_05_rvpc_multi_tiers Failure 563.38 test_vpc_redundant.py

test results are not consistent, triggering them again.

@blueorangutan test centos7 xenserver-71

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-892)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35705 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t892-vmware-67u3.zip
Smoke tests completed. 88 look OK, 0 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File

@yadvr

yadvr commented Jun 8, 2021

Copy link
Copy Markdown
Member

Tests LGTM, let's merge this.

@yadvr

yadvr commented Jun 8, 2021

Copy link
Copy Markdown
Member

Github was down, so I manually merged it in 9581824 and closing this PR based on that.

@yadvryadvr closed this Jun 8, 2021
@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-893)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33604 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4922-t893-xenserver-71.zip
Smoke tests completed. 88 look OK, 0 have error(s)
Only failed tests results shown below:

TestResultTime (s)Test File

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 236

@yadvr

Copy link
Copy Markdown
Member

@sureshanaparti this was manually quash merged, did we miss anything?

@sureshanaparti

Copy link
Copy Markdown
ContributorAuthor

@sureshanaparti this was manually quash merged, did we miss anything?

nothing missed @rhtyd, thanks.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 353

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@sureshanaparti@DaanHoogland@blueorangutan@nathanmcgarvey@yadvr@shwstppr@GabrielBrascher@davidjumani@nvazquez