Add watcher-grenade-skip-level-always job

watcher-grenade-skip-level-always job will tests upgrade from
N-2 to N release.

Note:
- It also adds scenario tests in grenade job
- It also drops unused from_rocky upgrade devstack file.
- It adds the new job to check and gate pipeline.

Change-Id: Iaf1a2ae5c4dfb3df39902d1b66a98152068a9349
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>

.zuul.yaml

@@ -196,12 +196,25 @@
     name: watcher-grenade
     parent: grenade
     required-projects: *tempest_base_required_projects
-    vars:
+    vars: &grenade_vars
       <<: *tempest_base_vars
+      tempest_test_regex: watcher_tempest_plugin.tests\.(api|scenario)
       devstack_plugins:
         watcher: https://opendev.org/openstack/watcher
     irrelevant-files: *irrelevant_files
 
+- job:
+    name: watcher-grenade-skip-level-always
+    description: |
+      Grenade job that skips the previous release, validating that projects
+      can support upgrades from N-2 to N release. It will always upgrade
+      to the current branch. For example: If N-2 is 2025.1 release then N
+      would be 2026.1.
+    parent: grenade-skip-level-always
+    required-projects: *tempest_base_required_projects
+    vars: *grenade_vars
+    irrelevant-files: *irrelevant_files
+
 - job:
     name: watcher-tempest-prometheus
     parent: watcher-tempest-base-two-node
@@ -372,6 +385,7 @@
       jobs:
         - openstack-tox-py312-threading
         - watcher-grenade
+        - watcher-grenade-skip-level-always
         - watcher-tempest-api-ipv6-only
         - watcher-tempest-gnocchi
         - python-watcherclient-functional:
@@ -384,6 +398,7 @@
       jobs:
         - openstack-tox-py312-threading
         - watcher-grenade
+        - watcher-grenade-skip-level-always
         - watcher-tempest-api-ipv6-only
         - watcher-tempest-gnocchi
         - python-watcherclient-functional:

devstack/upgrade/from_rocky/upgrade-watcher

@@ -1,13 +0,0 @@
-# ``upgrade-watcher``
-
-function configure_watcher_upgrade {
-    XTRACE=$(set +o | grep xtrace)
-    set -o xtrace
-
-    # Copy release-specific files
-    sudo cp $TARGET_RELEASE_DIR/watcher/etc/watcher/watcher.conf $WATCHER_CONF_DIR/watcher.conf
-    sudo cp $TARGET_RELEASE_DIR/watcher/etc/watcher/policy.yaml.sample $WATCHER_CONF_DIR/policy.yaml.sample
-
-    # reset to previous state
-    $XTRACE
-}