Merge pull request #186 from nmaludy/hotfix/skip-migrations

Fixing upgrade e2e tests to verify distro in proper branch
StackStorm · Apr 28, 2020 · 98ea9e4 · 98ea9e4
2 parents 84d1f5b + ff4fa7a
commit 98ea9e4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/actions/workflows/st2_pkg_upgrade_e2e_test.yaml b/actions/workflows/st2_pkg_upgrade_e2e_test.yaml
@@ -196,10 +196,10 @@ tasks:
         do:
           - upgrade_enterprise_packages_rpm
       # skip model migration for modern OSes where st2mistral is not present
-      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'UBUNTU18') %>
+      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'RHEL8' or ctx().distro = 'CENTOS8') %>
         do:
           - post_migration_start
-      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'UBUNTU16') %>
+      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'RHEL7' or ctx().distro = 'CENTOS7' or ctx().distro = 'RHEL6' or ctx().distro = 'CENTOS6') %>
         do:
           - migrate_models
   upgrade_packages_deb:
@@ -214,10 +214,10 @@ tasks:
         do:
           - upgrade_enterprise_packages_deb
       # skip model migration for modern OSes where st2mistral is not present
-      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'RHEL8' or ctx().distro = 'CENTOS8') %>
+      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'UBUNTU18') %>
         do:
           - post_migration_start
-      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'RHEL7' or ctx().distro = 'CENTOS7' or ctx().distro = 'RHEL6' or ctx().distro = 'CENTOS6') %>
+      - when: <% succeeded() and (not ctx().enterprise) and (ctx().distro = 'UBUNTU16') %>
         do:
           - migrate_models
   upgrade_enterprise_packages_deb: