Revert debug commits
This reverts commit 3c67bdc6ac71c042fbb3d119546a323fb27af6a3.
This reverts commit 653a8c78b85f6a911563ac3871901c6ecc66d357.
This reverts commit 46d2873acc0ce3938e55152682816f8a55824fd7.
This reverts commit 3b71c7c3fc92b12f008a680903b1146711567d34.
Change-Id: Ia84879e89e2d5b04b134525c767dfa4043ff6445
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml b/playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
index ffef4ff..f35b3f2 100644
--- a/playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
+++ b/playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
@@ -2,9 +2,6 @@
vars_files:
- vars.yaml
tasks:
- - name: Remove the StorPool Ports from the StorPool Node
- ansible.builtin.command: sleep 3600
-
- name: Clean Up Undercloud
block:
- name: Remove the StorPool Ports from the StorPool Node
diff --git a/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml b/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
index 78b2c73..8d953ec 100644
--- a/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
+++ b/playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
@@ -325,14 +325,11 @@
- "[defaults]"
- "timeout = 30"
-# - name: Deploy StorPool
-# ansible.builtin.command:
-# argv: ["ansible-playbook", "playbook.yml", "-i", "inventory.yaml", "--skip-tags", "perform-tests"]
-# args:
-# chdir: "/home/ubuntu/ansible"
-
- - name: Debug Sleep
- ansible.builtin.command: sleep 2400
+ - name: Deploy StorPool
+ ansible.builtin.command:
+ argv: ["ansible-playbook", "playbook.yml", "-i", "inventory.yaml", "--skip-tags", "perform-tests"]
+ args:
+ chdir: "/home/ubuntu/ansible"
- hosts: lab-sp-a1
vars_files:
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index ecde7c0..949ab71 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -271,14 +271,14 @@
kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy-pre-release"
tempest_test_regex: volume
-#- project:
-# name: openstack/cinder
-# check:
-# jobs:
-# - cinder-storpool-tempest:
-# branches: master
-# - cinder-storpool-tempest-iscsi-multipath:
-# branches: master
+- project:
+ name: openstack/cinder
+ check:
+ jobs:
+ - cinder-storpool-tempest:
+ branches: master
+ - cinder-storpool-tempest-iscsi-multipath:
+ branches: master
# experimental:
# jobs:
# #- cinder-storpool-tempest-experimental:
@@ -290,7 +290,7 @@
name: openstack/os-brick
check:
jobs:
- - cinder-storpool-tempest-iscsi-multipath:
+ - cinder-storpool-tempest:
branches: master
- project: