From db3f3b5c991d199dc7fd65228223e587624166b8 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 21 Jul 2020 13:04:58 -0700 Subject: [PATCH] [victoria][goal] Native Zuulv3 CI jobs Replace "legacy" style jobs with native zuulv3 ones built within the manila-tempest-plugin repository. This refactoring is driven by a community wide goal to stop relying on devstack-gate, a deprecated component of the OpenDev CI system [1] Remove in-tree devstack gate hook script portions that are no longer necessary; and mark the rest as deprecated, since third party CI could still be relying on these hooks. Replace "manila-tempest-dsvm-mysql-generic", "manila-tempest-dsvm-postgres-generic-singlebackend", "manila-tempest-dsvm-generic-no-share-servers" and "manila-tempest-dsvm-scenario" jobs with "manila-tempest-plugin-generic" which preserves coverage for the generic driver, while removing unnecessary duplication/separation. See commit message in [2] for more details. Remove older CentOS and HDFS jobs since they were not being executed. Remove "custom" image jobs targeting custom manila-image-element based builds, the jobs now originate in the manila-image-elements repository. [3] The dummy driver job has been split into two parts for testing DHSS=True and DHSS=False in separate jobs. Read more about the motivation in the commit message for the change that created that job [4] While some name tags such as "postgres" and "ipv6-only" have been removed from the job names, the functionality of the job hasn't been changed. This change will not be backported. Instead, new changes akin to this may directly target older branches of manila. [1] https://governance.openstack.org/tc/goals/selected/victoria/native-zuulv3-jobs.html [2] https://review.opendev.org/726291/ [3] https://opendev.org/openstack/manila-image-elements/src/commit/d9d2f1636066c7cd96e6cfd202c4db7ee3109b73/zuul.d/manila-image-elements-jobs.yaml#L34-L67 [4] https://review.opendev.org/740534/ Change-Id: I2be6fc12c787c05c7df68297990fcdca96f57c5d Signed-off-by: Goutham Pacha Ravi --- contrib/ci/common.sh | 106 ------ contrib/ci/post_test_hook.sh | 186 +--------- contrib/ci/pre_test_hook.sh | 110 +----- .../post.yaml | 15 - .../run.yaml | 108 ------ .../post.yaml | 15 - .../run.yaml | 94 ----- .../post.yaml | 15 - .../run.yaml | 107 ------ .../post.yaml | 15 - .../run.yaml | 83 ----- .../post.yaml | 15 - .../run.yaml | 83 ----- .../post.yaml | 15 - .../run.yaml | 84 ----- .../post.yaml | 15 - .../run.yaml | 83 ----- .../legacy/manila-tempest-dsvm-hdfs/post.yaml | 15 - .../legacy/manila-tempest-dsvm-hdfs/run.yaml | 74 ---- .../post.yaml | 15 - .../run.yaml | 92 ----- .../post.yaml | 15 - .../run.yaml | 93 ----- .../post.yaml | 15 - .../run.yaml | 92 ----- .../post.yaml | 15 - .../run.yaml | 93 ----- .../manila-tempest-dsvm-scenario/post.yaml | 15 - .../manila-tempest-dsvm-scenario/run.yaml | 92 ----- .../post.yaml | 15 - .../run.yaml | 132 ------- .../post.yaml | 15 - .../run.yaml | 102 ------ .../post.yaml | 28 -- .../run.yaml | 133 ------- .../post.yaml | 28 -- .../run.yaml | 119 ------- .../post.yaml | 15 - .../run.yaml | 84 ----- .../manila-tempest-minimal-dsvm-lvm/post.yaml | 15 - .../run-ipv6.yaml | 111 ------ .../manila-tempest-minimal-dsvm-lvm/run.yaml | 106 ------ zuul.d/project.yaml | 327 ++---------------- 43 files changed, 39 insertions(+), 2966 deletions(-) delete mode 100755 contrib/ci/common.sh delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml diff --git a/contrib/ci/common.sh b/contrib/ci/common.sh deleted file mode 100755 index 2eb47cb096..0000000000 --- a/contrib/ci/common.sh +++ /dev/null @@ -1,106 +0,0 @@ -# Environment variables - -# ---------------------------------------------- - -# Functions - -# Import devstack functions -source $BASE/new/devstack/functions - -function manila_check_service_vm_availability { - # First argument is expected to be IP address of a service VM - - wait_step=10 - wait_timeout=300 - available='false' - while (( wait_timeout > 0 )) ; do - if ping -w 1 $1; then - available='true' - break - fi - ((wait_timeout-=$wait_step)) - sleep $wait_step - done - - if [[ $available == 'true' ]]; then - echo "SUCCESS! Service VM $1 is available." - else - echo "FAILURE! Service VM $1 is not available." - exit 1 - fi -} - -function manila_wait_for_generic_driver_init { - # First argument is expected to be file path to Manila config - - MANILA_CONF=$1 - DRIVER_GROUPS=$(iniget $MANILA_CONF DEFAULT enabled_share_backends) - for driver_group in ${DRIVER_GROUPS//,/ }; do - SHARE_DRIVER=$(iniget $MANILA_CONF $driver_group share_driver) - GENERIC_DRIVER='manila.share.drivers.generic.GenericShareDriver' - DHSS=$(iniget $MANILA_CONF $driver_group driver_handles_share_servers) - if [[ $SHARE_DRIVER == $GENERIC_DRIVER && $(trueorfalse False DHSS) == False ]]; then - # Wait for service VM availability - source /opt/stack/new/devstack/openrc admin demo - vm_ip=$(iniget $MANILA_CONF $driver_group service_net_name_or_ip) - - # Check availability - manila_check_service_vm_availability $vm_ip - fi - done -} - -function manila_wait_for_drivers_init { - # First argument is expected to be file path to Manila config - - manila_wait_for_generic_driver_init $1 - - # Sleep to make manila-share service notify manila-scheduler about - # its capabilities on time. - sleep 10 -} - -function save_tempest_results { - # First argument is expected to be number or tempest run - - local src_dirname - local dst_dirname - - src_dirname="$BASE/new/tempest" - dst_dirname="$BASE/logs/tempest_$1" - - # 1. Create destination directory - sudo mkdir $dst_dirname - sudo chown $USER:stack $dst_dirname - sudo chmod 755 $dst_dirname - - # 2. Save tempest configuration file - sudo cp $src_dirname/etc/tempest.conf $dst_dirname/tempest_conf.txt - - # 3. Save tempest log file - cp $src_dirname/tempest.log $src_dirname/tempest.txt - echo '' > $src_dirname/tempest.log - sudo mv $src_dirname/tempest.txt $dst_dirname/tempest.txt - - # 4. Save tempest stestr results - - if [ -f $src_dirname/.stestr/0 ]; then - pushd $src_dirname - sudo stestr last --subunit > $src_dirname/tempest.subunit - popd - else - echo "Tests have not run!" - fi - - if [ -f $src_dirname/tempest.subunit ]; then - s2h=`type -p subunit2html` - sudo $s2h $src_dirname/tempest.subunit $src_dirname/testr_results.html - sudo mv $src_dirname/tempest.subunit $dst_dirname/tempest.subunit - sudo mv $src_dirname/testr_results.html $dst_dirname/testr_results.html - - # 5. Cleanup - sudo rm -rf $src_dirname/.stestr - else - echo "No 'stestr' results available for saving. File '$src_dirname/tempest.subunit' is absent." - fi -} diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 074a5429ed..f3649d8cc6 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -16,6 +16,10 @@ # First argument ($1) expects 'multibackend' as value for setting appropriate # tempest conf opts, all other values will assume singlebackend installation. +SCRIPT_IS_DEPRECATED="Manila's pre_test_hook and post_test_hook scripts are +DEPRECATED. Please use alternate tools to configure devstack's local.conf +file or run tempest tests" + sudo chown -R $USER:stack $BASE/new/tempest sudo chown -R $USER:stack $BASE/data/tempest sudo chmod -R o+rx $BASE/new/devstack/files @@ -43,9 +47,7 @@ TEST_TYPE=$3 POSTGRES_ENABLED=$4 POSTGRES_ENABLED=$(trueorfalse True POSTGRES_ENABLED) -if [[ "$DRIVER" == "dummy" ]]; then - export BACKENDS_NAMES="ALPHA,BETA" -elif [[ "$BACK_END_TYPE" == "multibackend" ]]; then +if [[ "$BACK_END_TYPE" == "multibackend" ]]; then iniset $TEMPEST_CONFIG share multi_backend True # Set share backends names, they are defined within pre_test_hook export BACKENDS_NAMES="LONDON,PARIS" @@ -159,141 +161,6 @@ cd $BASE/new/tempest export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-6} export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'} -if [[ "$DRIVER" == "generic"* ]]; then - RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS=True - RUN_MANILA_MANAGE_SNAPSHOT_TESTS=True - RUN_MANILA_CG_TESTS=False - if [[ "$MULTITENANCY_ENABLED" == "True" ]]; then - # NOTE(ganso): The generic driver has not implemented support for - # Manage/unmanage shares/snapshots in DHSS=True - RUN_MANILA_MANAGE_SNAPSHOT_TESTS=False - RUN_MANILA_MANAGE_TESTS=False - fi - if [[ "$POSTGRES_ENABLED" == "True" ]]; then - # Run only CIFS tests on PostgreSQL DB backend - # to reduce amount of tests per job using 'generic' share driver. - iniset $TEMPEST_CONFIG share enable_protocols cifs - else - # Run only NFS tests on MySQL DB backend to reduce amount of tests - # per job using 'generic' share driver. - iniset $TEMPEST_CONFIG share enable_protocols nfs - fi - MANILA_TESTS="(^manila_tempest_tests.tests.api)(?=.*\[.*\bbackend\b.*\])" - RUN_MANILA_SG_TESTS=False -fi - -if [[ "$DRIVER" == "generic_with_custom_image" ]]; then - # For CI jobs that test changes to image we do not need to run lots of tests - # Will be enough to run simple scenario test, because - # if some package is lost, it is very likely to fail with each test. - MANILA_TESTS="(^manila_tempest_tests.tests.scenario)(?=.*\btest_write_data_to_share_created_from_snapshot\b.*)" -elif [[ "$TEST_TYPE" == "scenario" ]]; then - echo "Set test set to scenario only" - MANILA_TESTS='manila_tempest_tests.tests.scenario' - iniset $TEMPEST_CONFIG auth use_dynamic_credentials True - RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS=True -fi - -if [[ "$DRIVER" == "lvm" ]]; then - MANILA_TESTS="(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])" - MANILA_TEMPEST_CONCURRENCY=8 - RUN_MANILA_SG_TESTS=False - RUN_MANILA_MANAGE_TESTS=False - RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS=True - RUN_MANILA_SHRINK_TESTS=False - RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True - RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True - RUN_MANILA_IPV6_TESTS=True - iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs' - iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs' - iniset $TEMPEST_CONFIG share image_with_share_tools 'manila-service-image-master' - iniset $TEMPEST_CONFIG auth use_dynamic_credentials True - iniset $TEMPEST_CONFIG share capability_snapshot_support True - if ! grep $USERNAME_FOR_USER_RULES "/etc/passwd"; then - sudo useradd $USERNAME_FOR_USER_RULES - fi - (echo $PASSWORD_FOR_SAMBA_USER; echo $PASSWORD_FOR_SAMBA_USER) | sudo smbpasswd -s -a $USERNAME_FOR_USER_RULES - sudo smbpasswd -e $USERNAME_FOR_USER_RULES - samba_daemon_name=smbd - if is_fedora; then - samba_daemon_name=smb - fi - sudo service $samba_daemon_name restart -elif [[ "$DRIVER" == "zfsonlinux" ]]; then - MANILA_TESTS="(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])" - MANILA_TEMPEST_CONCURRENCY=8 - RUN_MANILA_SG_TESTS=False - RUN_MANILA_MANAGE_TESTS=True - RUN_MANILA_MANAGE_SNAPSHOT_TESTS=True - RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS=True - RUN_MANILA_DRIVER_ASSISTED_MIGRATION_TESTS=True - RUN_MANILA_REPLICATION_TESTS=True - iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs' - iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols '' - iniset $TEMPEST_CONFIG share enable_cert_rules_for_protocols '' - iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols 'nfs' - iniset $TEMPEST_CONFIG share build_timeout 180 - iniset $TEMPEST_CONFIG share share_creation_retry_number 0 - iniset $TEMPEST_CONFIG share capability_storage_protocol 'NFS' - iniset $TEMPEST_CONFIG share enable_protocols 'nfs' - iniset $TEMPEST_CONFIG share suppress_errors_in_cleanup False - iniset $TEMPEST_CONFIG share multitenancy_enabled False - iniset $TEMPEST_CONFIG share multi_backend True - iniset $TEMPEST_CONFIG share backend_replication_type 'readable' - iniset $TEMPEST_CONFIG share image_with_share_tools 'manila-service-image-master' - iniset $TEMPEST_CONFIG auth use_dynamic_credentials True - iniset $TEMPEST_CONFIG share capability_snapshot_support True - iniset $TEMPEST_CONFIG share run_create_share_from_snapshot_in_another_pool_or_az_tests True -elif [[ "$DRIVER" == "dummy" ]]; then - MANILA_TEMPEST_CONCURRENCY=24 - MANILA_CONFIGURE_DEFAULT_TYPES=False - RUN_MANILA_SG_TESTS=True - RUN_MANILA_MANAGE_TESTS=True - RUN_MANILA_MANAGE_SNAPSHOT_TESTS=True - RUN_MANILA_DRIVER_ASSISTED_MIGRATION_TESTS=True - RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True - RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True - RUN_MANILA_MIGRATION_WITH_PRESERVE_SNAPSHOTS_TESTS=True - RUN_MANILA_REPLICATION_TESTS=True - iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs' - iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs' - iniset $TEMPEST_CONFIG share enable_cert_rules_for_protocols '' - iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols 'nfs,cifs' - iniset $TEMPEST_CONFIG share build_timeout 180 - iniset $TEMPEST_CONFIG share share_creation_retry_number 0 - iniset $TEMPEST_CONFIG share capability_storage_protocol 'NFS_CIFS' - iniset $TEMPEST_CONFIG share capability_sg_consistent_snapshot_support 'pool' - iniset $TEMPEST_CONFIG share enable_protocols 'nfs,cifs' - iniset $TEMPEST_CONFIG share suppress_errors_in_cleanup False - iniset $TEMPEST_CONFIG share multitenancy_enabled True - iniset $TEMPEST_CONFIG share create_networks_when_multitenancy_enabled False - iniset $TEMPEST_CONFIG share multi_backend True - iniset $TEMPEST_CONFIG share backend_replication_type 'readable' -elif [[ "$DRIVER" == "container"* ]]; then - if [[ "$DRIVER" == "container_with_custom_image" ]]; then - # TODO(vponomaryov): set scenario tests for run when - # manila tempest plugin supports share protocol and rules that - # container driver uses. - # MANILA_TESTS="(^manila_tempest_tests.tests.scenario)(?=.*\btest_read_write_two_vms\b.*)" - : - fi - MANILA_TEMPEST_CONCURRENCY=8 - RUN_MANILA_SG_TESTS=False - RUN_MANILA_MANAGE_TESTS=True - RUN_MANILA_QUOTA_TESTS=False - RUN_MANILA_SHRINK_TESTS=False - RUN_MANILA_SNAPSHOT_TESTS=False - RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS=False - CAPABILITY_CREATE_SHARE_FROM_SNAPSHOT_SUPPORT=False - iniset $TEMPEST_CONFIG share capability_storage_protocol 'CIFS' - iniset $TEMPEST_CONFIG share enable_protocols 'cifs' - iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs' - iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols '' - - # TODO(vponomaryov): set following to True when bug #1679715 is fixed - iniset $TEMPEST_CONFIG auth use_dynamic_credentials False -fi - # Enable quota tests iniset $TEMPEST_CONFIG share run_quota_tests $RUN_MANILA_QUOTA_TESTS @@ -340,11 +207,6 @@ ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"} export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME -# Also, we should wait until service VM is available -# before running Tempest tests using Generic driver in DHSS=False mode. -source $BASE/new/manila/contrib/ci/common.sh -manila_wait_for_drivers_init $MANILA_CONF - source $BASE/new/devstack/openrc admin admin public_net_id=$(openstack network list --name $PUBLIC_NETWORK_NAME -f value -c ID ) iniset $TEMPEST_CONFIG network public_network_id $public_net_id @@ -363,6 +225,8 @@ echo "Manila service details" source $BASE/new/devstack/openrc admin admin manila service-list +echo $SCRIPT_IS_DEPRECATED + echo "Running tempest manila test suites" cd $BASE/new/tempest/ # List plugins in logs to enable debugging @@ -370,40 +234,4 @@ sudo -H -u $USER tempest list-plugins sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY RETVAL=$? cd - - - -# If using the dummy driver, configure the second run. We can't use the -# devstack variables RUN_MANILA_* now, we'll directly iniset tempest options. -if [[ "$DRIVER" == "dummy" ]]; then - save_tempest_results 1 - echo "First tempest run (DHSS=True) returned '$RETVAL'" - iniset $TEMPEST_CONFIG share backend_names "GAMMA,DELTA" - iniset $TEMPEST_CONFIG share run_manage_unmanage_tests True - iniset $TEMPEST_CONFIG share run_manage_unmanage_snapshot_tests True - iniset $TEMPEST_CONFIG share run_replication_tests True - iniset $TEMPEST_CONFIG share multitenancy_enabled False - iniset $TEMPEST_CONFIG share backend_replication_type 'readable' - - # Change driver mode for default share type to make tempest use - # DHSS=False backends. This is just done here for semantics, if - # the default share type hasn't been configured - # ($MANILA_CONFIGURE_DEFAULT_TYPES=False), this command has no effect - # since there is no default share type configured. - source $BASE/new/devstack/openrc admin demo - manila type-key default set driver_handles_share_servers=False - - echo "Running tempest manila test suites for DHSS=False mode" - cd $BASE/new/tempest/ - sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY - RETVAL2=$? - cd - - save_tempest_results 2 - - # Exit with last code if first succeeded else exit with first error code - if [[ "$RETVAL" == "0" ]]; then - RETVAL=$RETVAL2 - fi - - echo "Second tempest run (DHSS=False) returned '$RETVAL2'" -fi exit $RETVAL diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index de0d46502e..633d367325 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -17,9 +17,11 @@ # 'False' means share driver will not handle share servers # 'True' means it will handle share servers. -# Import devstack function 'trueorfalse' +# Import devstack function 'trueorfalse', 'deprecated' source $BASE/new/devstack/functions +deprecated "Manila's pre_test_hook and post_test_hook scripts are DEPRECATED. Please use alternate tools to configure devstack's local.conf file" + localconf=$BASE/new/devstack/local.conf echo "[[local|localrc]]" >> $localconf @@ -83,96 +85,9 @@ echo "MANILA_SHARE_MIGRATION_PERIOD_TASK_INTERVAL=${MANILA_SHARE_MIGRATION_PERIO MANILA_SERVICE_IMAGE_ENABLED=${MANILA_SERVICE_IMAGE_ENABLED:-False} DEFAULT_EXTRA_SPECS=${DEFAULT_EXTRA_SPECS:-"'snapshot_support=True create_share_from_snapshot_support=True'"} -if [[ "$DRIVER" == "generic"* ]]; then - MANILA_SERVICE_IMAGE_ENABLED=True - echo "SHARE_DRIVER=manila.share.drivers.generic.GenericShareDriver" >> $localconf -elif [[ "$DRIVER" == "windows" ]]; then +if [[ "$DRIVER" == "windows" ]]; then MANILA_SERVICE_IMAGE_ENABLED=True echo "SHARE_DRIVER=manila.share.drivers.windows.windows_smb_driver.WindowsSMBDriver" >> $localconf -elif [[ "$DRIVER" == "dummy" ]]; then - driver_path="manila.tests.share.drivers.dummy.DummyDriver" - DEFAULT_EXTRA_SPECS="'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'" - echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localconf - - # Run dummy driver CI job using standalone approach for running - # manila API service just because we need to test this approach too, - # that is very useful for development needs. - echo "MANILA_USE_UWSGI=False" >> $localconf - echo "MANILA_USE_MOD_WSGI=False" >> $localconf - - echo "SHARE_DRIVER=$driver_path" >> $localconf - echo "SUPPRESS_ERRORS_IN_CLEANUP=False" >> $localconf - echo "MANILA_REPLICA_STATE_UPDATE_INTERVAL=10" >> $localconf - echo "MANILA_ENABLED_BACKENDS=alpha,beta,gamma,delta" >> $localconf - echo "MANILA_CONFIGURE_GROUPS=alpha,beta,gamma,delta,membernet,adminnet" >> $localconf - - echo "MANILA_OPTGROUP_alpha_share_driver=$driver_path" >> $localconf - echo "MANILA_OPTGROUP_alpha_driver_handles_share_servers=True" >> $localconf - echo "MANILA_OPTGROUP_alpha_share_backend_name=ALPHA" >> $localconf - echo "MANILA_OPTGROUP_alpha_network_config_group=membernet" >> $localconf - echo "MANILA_OPTGROUP_alpha_admin_network_config_group=adminnet" >> $localconf - echo "MANILA_OPTGROUP_alpha_replication_domain=DUMMY_DOMAIN_2" >> $localconf - - echo "MANILA_OPTGROUP_beta_share_driver=$driver_path" >> $localconf - echo "MANILA_OPTGROUP_beta_driver_handles_share_servers=True" >> $localconf - echo "MANILA_OPTGROUP_beta_share_backend_name=BETA" >> $localconf - echo "MANILA_OPTGROUP_beta_network_config_group=membernet" >> $localconf - echo "MANILA_OPTGROUP_beta_admin_network_config_group=adminnet" >> $localconf - echo "MANILA_OPTGROUP_beta_replication_domain=DUMMY_DOMAIN_2" >> $localconf - - echo "MANILA_OPTGROUP_gamma_share_driver=$driver_path" >> $localconf - echo "MANILA_OPTGROUP_gamma_driver_handles_share_servers=False" >> $localconf - echo "MANILA_OPTGROUP_gamma_share_backend_name=GAMMA" >> $localconf - echo "MANILA_OPTGROUP_gamma_replication_domain=DUMMY_DOMAIN" >> $localconf - - echo "MANILA_OPTGROUP_delta_share_driver=$driver_path" >> $localconf - echo "MANILA_OPTGROUP_delta_driver_handles_share_servers=False" >> $localconf - echo "MANILA_OPTGROUP_delta_share_backend_name=DELTA" >> $localconf - echo "MANILA_OPTGROUP_delta_replication_domain=DUMMY_DOMAIN" >> $localconf - - echo "MANILA_OPTGROUP_membernet_network_api_class=manila.network.standalone_network_plugin.StandaloneNetworkPlugin" >> $localconf - echo "MANILA_OPTGROUP_membernet_standalone_network_plugin_gateway=10.0.0.1" >> $localconf - echo "MANILA_OPTGROUP_membernet_standalone_network_plugin_mask=24" >> $localconf - echo "MANILA_OPTGROUP_membernet_standalone_network_plugin_network_type=vlan" >> $localconf - echo "MANILA_OPTGROUP_membernet_standalone_network_plugin_segmentation_id=1010" >> $localconf - echo "MANILA_OPTGROUP_membernet_standalone_network_plugin_allowed_ip_ranges=10.0.0.10-10.0.0.209" >> $localconf - echo "MANILA_OPTGROUP_membernet_network_plugin_ipv4_enabled=True" >> $localconf - - echo "MANILA_OPTGROUP_adminnet_network_api_class=manila.network.standalone_network_plugin.StandaloneNetworkPlugin" >> $localconf - echo "MANILA_OPTGROUP_adminnet_standalone_network_plugin_gateway=11.0.0.1" >> $localconf - echo "MANILA_OPTGROUP_adminnet_standalone_network_plugin_mask=24" >> $localconf - echo "MANILA_OPTGROUP_adminnet_standalone_network_plugin_network_type=vlan" >> $localconf - echo "MANILA_OPTGROUP_adminnet_standalone_network_plugin_segmentation_id=1011" >> $localconf - echo "MANILA_OPTGROUP_adminnet_standalone_network_plugin_allowed_ip_ranges=11.0.0.10-11.0.0.19,11.0.0.30-11.0.0.39,11.0.0.50-11.0.0.199" >> $localconf - echo "MANILA_OPTGROUP_adminnet_network_plugin_ipv4_enabled=True" >> $localconf - - export MANILA_TEMPEST_CONCURRENCY=24 - export MANILA_CONFIGURE_DEFAULT_TYPES=False - -elif [[ "$DRIVER" == "lvm" ]]; then - MANILA_SERVICE_IMAGE_ENABLED=True - DEFAULT_EXTRA_SPECS="'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'" - - echo "SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver" >> $localconf - echo "SHARE_BACKING_FILE_SIZE=32000M" >> $localconf -elif [[ "$DRIVER" == "zfsonlinux" ]]; then - MANILA_SERVICE_IMAGE_ENABLED=True - echo "SHARE_DRIVER=manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" >> $localconf - echo "RUN_MANILA_REPLICATION_TESTS=True" >> $localconf - # Enable using the scheduler when creating a share from snapshot - echo "MANILA_USE_SCHEDULER_CREATING_SHARE_FROM_SNAPSHOT=True" >> $localconf - # Set the replica_state_update_interval to 60 seconds to make - # replication tests run faster. The default is 300, which is greater than - # the build timeout for ZFS on the gate. - echo "MANILA_REPLICA_STATE_UPDATE_INTERVAL=60" >> $localconf - echo "MANILA_ZFSONLINUX_USE_SSH=True" >> $localconf - # Set proper host IP for user export to be able to run scenario tests correctly - echo "MANILA_ZFSONLINUX_SHARE_EXPORT_IP=$HOST" >> $localconf - echo "MANILA_ZFSONLINUX_SERVICE_IP=127.0.0.1" >> $localconf -elif [[ "$DRIVER" == "container"* ]]; then - DEFAULT_EXTRA_SPECS="'snapshot_support=false'" - echo "SHARE_DRIVER=manila.share.drivers.container.driver.ContainerShareDriver" >> $localconf - echo "SHARE_BACKING_FILE_SIZE=64000M" >> $localconf fi echo "MANILA_SERVICE_IMAGE_ENABLED=$MANILA_SERVICE_IMAGE_ENABLED" >> $localconf @@ -203,20 +118,3 @@ if [[ "$MANILA_SETUP_IPV6" == True ]]; then echo "IP_VERSION=4+6" >> $localconf echo "MANILA_RESTORE_IPV6_DEFAULT_ROUTE=False" >> $localconf fi - -if [[ "$DRIVER" == "generic"* ]]; then - echo -e '[[post-config|${NOVA_CONF:-/etc/nova/nova.conf}]]\n[DEFAULT]\nquota_instances=30\n' >> $localconf - echo -e '[[post-config|${NEUTRON_CONF:-/etc/neutron/neutron.conf}]]\n[DEFAULT]\nmax_fixed_ips_per_port=100\n' >> $localconf - echo -e '[[post-config|${NEUTRON_CONF:-/etc/neutron/neutron.conf}]]\n[QUOTAS]\nquota_subnet=-1\n' >> $localconf -fi - -# Required for "grenade" job that uses devstack config from 'old' directory. -if [[ -d "$BASE/old/devstack" ]]; then - cp $localconf $BASE/old/devstack/local.conf -fi - -cd $BASE/new/tempest -source $BASE/new/manila/contrib/ci/common.sh - -# Print current Tempest status -git status diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml deleted file mode 100644 index 6d6c37d1a6..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml +++ /dev/null @@ -1,108 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-manila-tempest-dsvm-container-scenario-custom-image - from old job gate-manila-tempest-dsvm-container-scenario-custom-image-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=0 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - # Install manila-image-elements project for building custom image - export PROJECTS="openstack/manila-image-elements $PROJECTS" - - export ENABLED_SERVICES=tempest - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - function pre_test_hook { - current_dir=$(pwd) - - # Go to 'manila-image-elements' dir, build image and get its name - cd /opt/stack/new/manila-image-elements - ./tools/gate/build-images container_with_custom_image - image_name=$(cat ./IMAGE_NAME) - export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name" - export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name)) - - # Return back to execution dir - cd $current_dir - - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - container_with_custom_image \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - container_with_custom_image \ - scenario \ - 0 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml deleted file mode 100644 index 5f85edc476..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml +++ /dev/null @@ -1,94 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-generic-no-share-servers from old job gate-manila-tempest-dsvm-generic-no-share-servers-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=0 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - export DEVSTACK_GATE_USE_PYTHON3=True - - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 0 \ - generic \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - generic \ - api \ - 0 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml deleted file mode 100644 index 70a6324e95..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml +++ /dev/null @@ -1,107 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-manila-tempest-dsvm-generic-scenario-custom-image - from old job gate-manila-tempest-dsvm-generic-scenario-custom-image-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=0 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - # Install manila-image-elements project for building custom image - export PROJECTS="openstack/manila-image-elements $PROJECTS" - - export ENABLED_SERVICES=tempest - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - function pre_test_hook { - current_dir=$(pwd) - - # Go to 'manila-image-elements' dir, build image and get its name - cd /opt/stack/new/manila-image-elements - ./tools/gate/build-images generic_with_custom_image - image_name=$(cat ./IMAGE_NAME) - export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name" - export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name)) - - # Return back to execution dir - cd $current_dir - - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - generic_with_custom_image \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - generic_with_custom_image \ - scenario \ - 0 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml deleted file mode 100644 index 1c9c66cde2..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-glusterfs-native-heketi from old job gate-manila-tempest-dsvm-glusterfs-native-heketi-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. - enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs - - # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila. - CONFIGURE_GLUSTERFS_MANILA=True - - # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant. - GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native-heketi - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # Configure devstack to run manila installation without handling of share servers - source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ - singlebackend \ - glusterfs-heketi \ - api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml deleted file mode 100644 index 077366080a..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-glusterfs-native from old job gate-manila-tempest-dsvm-glusterfs-native-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. - enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs - - # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila. - CONFIGURE_GLUSTERFS_MANILA=True - - # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant. - GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # Configure devstack to run manila installation without handling of share servers - source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ - singlebackend \ - glusterfs-native \ - api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml deleted file mode 100644 index 5ef8d622e5..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-glusterfs-nfs-heketi from old - job gate-manila-tempest-dsvm-glusterfs-nfs-heketi-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. - enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs - - # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila. - CONFIGURE_GLUSTERFS_MANILA=True - - # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant. - GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-nfs-heketi - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # Configure devstack to run manila installation without handling of share servers - source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ - singlebackend \ - glusterfs-nfs-heketi \ - api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml deleted file mode 100644 index bf564bd8f7..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-glusterfs-nfs from old job gate-manila-tempest-dsvm-glusterfs-nfs-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. - enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs - - # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila. - CONFIGURE_GLUSTERFS_MANILA=True - - # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant. - GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-nfs - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS" - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # Configure devstack to run manila installation without handling of share servers - source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run tempest on singlebackend manila installation - source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh \ - singlebackend \ - glusterfs-nfs \ - api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml deleted file mode 100644 index 4863f065db..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml +++ /dev/null @@ -1,74 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-manila-tempest-dsvm-hdfs from old job gate-manila-tempest-dsvm-hdfs-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - # Enable devstack-plugin-hdfs plugin, to install and configure HDFS. - enable_plugin devstack-plugin-hdfs https://opendev.org/x/devstack-plugin-hdfs - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="x/devstack-plugin-hdfs $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - function pre_test_hook { - # Configure devstack to run manila installation without handling of share servers - source $BASE/new/devstack-plugin-hdfs/manila/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run tempest on multi-backend manila installation - source $BASE/new/devstack-plugin-hdfs/manila/post_test_hook.sh - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml deleted file mode 100644 index e49f18d56e..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml +++ /dev/null @@ -1,92 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-mysql-generic from old job gate-manila-tempest-dsvm-mysql-generic-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=0 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - generic \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - generic \ - api \ - 0 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml deleted file mode 100644 index b89d067c29..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ /dev/null @@ -1,93 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-postgres-container from old job gate-manila-tempest-dsvm-postgres-container-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - container \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - container \ - api \ - 1 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml deleted file mode 100644 index f77fdabe40..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ /dev/null @@ -1,92 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-postgres-generic-singlebackend from old job gate-manila-tempest-dsvm-postgres-generic-singlebackend-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - generic \ - singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - singlebackend \ - generic \ - api \ - 1 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml deleted file mode 100644 index 0d14bca245..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ /dev/null @@ -1,93 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-postgres-zfsonlinux from old job gate-manila-tempest-dsvm-postgres-zfsonlinux-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 0 \ - zfsonlinux \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - zfsonlinux \ - api \ - 1 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml deleted file mode 100644 index c7ea443b96..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml +++ /dev/null @@ -1,92 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-dsvm-scenario from old job gate-manila-tempest-dsvm-scenario-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_POSTGRES=0 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export ENABLED_SERVICES=tempest - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh \ - 1 \ - generic \ - multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh \ - multibackend \ - generic \ - scenario \ - 0 - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml deleted file mode 100644 index 80659893f1..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml +++ /dev/null @@ -1,132 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-dsvm-cephfs-native-centos-7 from old job gate-manila-tempest-minimal-dsvm-cephfs-native-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - # Install centos-release-openstack-* needed for rabbitmq-server - - name: Add centos-release-openstack-pike support - become: yes - yum: - name: centos-release-openstack-pike - state: present - - - name: Check for /etc/yum/vars/contentdir - stat: - path: /etc/yum/vars/contentdir - register: yum_contentdir - - - when: not yum_contentdir.stat.exists - block: - - - name: Discover package architecture - command: rpm -q --qf "%{arch}" -f /etc/redhat-release - register: rpm_arch - - - debug: - msg: Package architecture is '{{ rpm_arch.stdout }}' - - - name: Set contentdir to altarch - set_fact: - yum_contentdir: altarch - when: rpm_arch.stdout in ['aarch64', 'ppc64le'] - - - name: Populate /etc/yum/vars/contentdir - copy: - dest: /etc/yum/vars/contentdir - content: "{{ yum_contentdir|default('centos') }}" - become: true - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnative - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - export OVERRIDE_ENABLED_SERVICES - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnative singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnative api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml deleted file mode 100644 index 38ea8949d0..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml +++ /dev/null @@ -1,102 +0,0 @@ -- hosts: all - name: manila-tempest-minimal-dsvm-cephfs-native - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnative - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - export OVERRIDE_ENABLED_SERVICES - - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export DEVSTACK_GATE_USE_PYTHON3=True - - export RUN_MANILA_SNAPSHOT_TESTS=True - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnative singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnative api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml deleted file mode 100644 index 514af465bd..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy ganesha config and logs - synchronize: - src: '{{ item.src }}' - dest: '{{ zuul.executor.log_root }}/{{ item.dest }}' - mode: pull - copy_links: true - verify_host: true - with_items: - - src: /etc/ganesha - dest: logs/etc/ - - src: /var/log/ganesha - dest: logs/ diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml deleted file mode 100644 index a48cf67d05..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml +++ /dev/null @@ -1,133 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-dsvm-cephfs-nfs-centos-7 from old job gate-manila-tempest-minimal-dsvm-cephfs-nfs-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - # Install centos-release-openstack-* needed for rabbitmq-server - - name: Add centos-release-openstack-pike support - become: yes - yum: - name: centos-release-openstack-pike - state: present - - - name: Check for /etc/yum/vars/contentdir - stat: - path: /etc/yum/vars/contentdir - register: yum_contentdir - - - when: not yum_contentdir.stat.exists - block: - - - name: Discover package architecture - command: rpm -q --qf "%{arch}" -f /etc/redhat-release - register: rpm_arch - - - debug: - msg: Package architecture is '{{ rpm_arch.stdout }}' - - - name: Set contentdir to altarch - set_fact: - yum_contentdir: altarch - when: rpm_arch.stdout in ['aarch64', 'ppc64le'] - - - name: Populate /etc/yum/vars/contentdir - copy: - dest: /etc/yum/vars/contentdir - content: "{{ yum_contentdir|default('centos') }}" - become: true - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnfs - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - export OVERRIDE_ENABLED_SERVICES - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnfs singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnfs api - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml deleted file mode 100644 index 514af465bd..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy ganesha config and logs - synchronize: - src: '{{ item.src }}' - dest: '{{ zuul.executor.log_root }}/{{ item.dest }}' - mode: pull - copy_links: true - verify_host: true - with_items: - - src: /etc/ganesha - dest: logs/etc/ - - src: /var/log/ganesha - dest: logs/ diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml deleted file mode 100644 index 6ef11e3373..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ /dev/null @@ -1,119 +0,0 @@ -- hosts: all - name: manila-tempest-minimal-dsvm-cephfs-nfs - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph - - # Enable CephFS as the backend for Manila. - ENABLE_CEPH_MANILA=True - - # Disable Ceph as the storage backend for Nova. - ENABLE_CEPH_NOVA=False - - # Disable Ceph as the storage backend for Glance. - ENABLE_CEPH_GLANCE=False - - # Disable Ceph as the storage backend for Cinder. - ENABLE_CEPH_CINDER=False - - # Disable Ceph as the storage backend for Cinder backup. - ENABLE_CEPH_C_BAK=False - - # Set native or NFS variant of ceph driver - MANILA_CEPH_DRIVER=cephfsnfs - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - export MANILA_SETUP_IPV6=True - export RUN_MANILA_IPV6_TESTS=True - export RUN_MANILA_SNAPSHOT_TESTS=True - - # Basic services needed for minimal job - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - # Enable glance for scenario tests - OVERRIDE_ENABLED_SERVICES+=,g-api - # Enable nova for scenario tests - OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj - # Enable neutron for scenario tests - OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt - # Enable tls-proxy - OVERRIDE_ENABLED_SERVICES+=,tls-proxy - OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client - export OVERRIDE_ENABLED_SERVICES - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" - PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - export PROJECTS - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # Configure Manila with a CephFS Native or NFS driver backend. - # Refer to job-template pre_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \ - false cephfsnfs singlebackend - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run Tempest API tests on Manila with a - # CephFSNative driver backend. - # Refer to job-template post_test_hook for more details on the - # arguments. - source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \ - singlebackend cephfsnfs api_with_scenario - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml deleted file mode 100644 index 293ff20616..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-dsvm-dummy from old job gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - # Basic services needed for minimal job - export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,tls-proxy - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh False dummy multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend dummy api False - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml deleted file mode 100644 index ec5991bfff..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml +++ /dev/null @@ -1,111 +0,0 @@ -- hosts: all - name: IPv6 version of manila-tempest-minimal-dsvm-lvm - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - SERVICE_IP_VERSION=6 - SERVICE_HOST="" - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export MANILA_SETUP_IPV6=True - export RUN_MANILA_IPV6_TESTS=True - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - # Basic services needed for minimal job - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - # Enable glance for scenario tests - OVERRIDE_ENABLED_SERVICES+=,g-api - # Enable nova for scenario tests - OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj - # Enable neutron for scenario tests - OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt - # Enable tls-proxy - OVERRIDE_ENABLED_SERVICES+=,tls-proxy - - # Enable mandatory placement services for nova starting with ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client - fi - export OVERRIDE_ENABLED_SERVICES - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh False lvm multibackend - } - export -f pre_test_hook - - function post_test_hook { - cd $BASE/new/tempest/tools - ./verify-ipv6-only-deployments.sh - - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend lvm api False - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml deleted file mode 100644 index e06901d728..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ /dev/null @@ -1,106 +0,0 @@ -- hosts: all - name: Autoconverted job manila-tempest-minimal-dsvm-lvm from old job gate-manila-tempest-minimal-dsvm-lvm - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - SKIP_EPEL_INSTALL=True - enable_plugin manila https://opendev.org/openstack/manila - enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin - enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - - export MANILA_SETUP_IPV6=True - export RUN_MANILA_IPV6_TESTS=True - export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False - export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True - - # Basic services needed for minimal job - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - # Enable glance for scenario tests - OVERRIDE_ENABLED_SERVICES+=,g-api - # Enable nova for scenario tests - OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj - # Enable neutron for scenario tests - OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt - # Enable tls-proxy - OVERRIDE_ENABLED_SERVICES+=,tls-proxy - - # Enable mandatory placement services for nova starting with ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client - fi - export OVERRIDE_ENABLED_SERVICES - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" - export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - - export DEVSTACK_GATE_USE_PYTHON3=True - - function pre_test_hook { - # 'dhss' - acronym for 'Driver Handles Share Servers', - # defines mode of a share driver. Boolean-like. - # 'driver' - codename of a share driver to configure. - # 'back_end_type' - defines which installation Manila should - # have - either 'singlebackend' or 'multibackend'. - source $BASE/new/manila/contrib/ci/pre_test_hook.sh False lvm multibackend - } - export -f pre_test_hook - - function post_test_hook { - # 'back_end_type' - defines which installation Manila is - # configured to - either 'singlebackend' or 'multibackend'. - # 'driver' - codename of a share driver that is configured in - # Manila. It is used for enabling/disabling tests that are not - # supported by share driver that is used. - # 'test_type' - defines which set of test suites should be used, - # can have 'api' and 'scenario' values. - # 'postgres_enabled' - set of test suites depends on DB backend - # in some cases, so it is provided explicitely. Boolean-like. - source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend lvm api False - } - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index c84fdde7c8..40321be52b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -10,325 +10,44 @@ check: jobs: - manila-tox-genconfig - - manila-tempest-dsvm-mysql-generic: + - openstack-tox-pylint: voting: false - - manila-tempest-dsvm-postgres-container: + timeout: 5400 + - openstack-tox-cover: voting: false - - manila-tempest-dsvm-postgres-zfsonlinux: + - manila-tempest-plugin-dummy-no-dhss + - manila-tempest-plugin-dummy-dhss + - manila-tempest-plugin-lvm + - manila-tempest-plugin-cephfs-native: voting: false - - manila-tempest-dsvm-postgres-generic-singlebackend: + - manila-tempest-plugin-cephfs-nfs: voting: false - - manila-tempest-dsvm-generic-no-share-servers: + - manila-tempest-plugin-container: voting: false - - manila-tempest-dsvm-scenario: + - manila-tempest-plugin-generic: voting: false - - manila-tempest-minimal-dsvm-cephfs-native: + - manila-tempest-plugin-glusterfs-native: voting: false - - manila-tempest-minimal-dsvm-cephfs-nfs: + - manila-tempest-plugin-glusterfs-nfs: voting: false - - manila-tempest-dsvm-glusterfs-nfs: + - manila-tempest-plugin-zfsonlinux: voting: false - - manila-tempest-dsvm-glusterfs-native: - voting: false - - manila-tempest-minimal-dsvm-dummy - - manila-tempest-minimal-lvm-ipv6-only - manila-grenade: voting: false - manila-rally-no-ss: voting: false - manila-rally-ss: voting: false - - openstack-tox-pylint: - voting: false - timeout: 5400 - - openstack-tox-cover: - voting: false gate: queue: manila jobs: - - manila-tox-genconfig - - manila-tempest-minimal-dsvm-dummy - - manila-tempest-minimal-lvm-ipv6-only + - manila-tempest-plugin-dummy-no-dhss + - manila-tempest-plugin-dummy-dhss + - manila-tempest-plugin-lvm experimental: jobs: - - manila-tempest-dsvm-glusterfs-nfs-heketi - - manila-tempest-dsvm-glusterfs-native-heketi - - manila-tempest-minimal-dsvm-cephfs-native-centos-7 - - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7 - tripleo-ci-centos-7-scenario004-standalone -- job: - name: manila-tempest-base - parent: legacy-dsvm-base - timeout: 7200 - irrelevant-files: &tempest-irrelevant-files - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^api-ref/.*$ - - ^doc/.*$ - - ^manila/hacking/.*$ - - ^manila/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tools/.*$ - - ^tox.ini$ - -- job: - name: manila-tempest-dsvm-container-scenario-custom-image - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-generic-no-share-servers - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-generic-scenario-custom-image - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-glusterfs-native - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-glusterfs - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-glusterfs-native-heketi - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-glusterfs - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-glusterfs-nfs - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-glusterfs - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-glusterfs-nfs-heketi - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-glusterfs - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-hdfs - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-hdfs - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-mysql-generic - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-postgres-container - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-postgres-generic-singlebackend - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-postgres-zfsonlinux - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-dsvm-scenario - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml - post-run: playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-image-elements - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-cephfs-native-centos-7 - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml - nodeset: legacy-centos-7 - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-cephfs-native - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-cephfs-nfs-centos-7 - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml - nodeset: legacy-centos-7 - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-cephfs-nfs - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/devstack-plugin-ceph - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/neutron-dynamic-routing - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-dummy - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-dsvm-lvm - parent: manila-tempest-base - run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml - post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml - required-projects: - - openstack/devstack-gate - - openstack/manila - - openstack/manila-tempest-plugin - - openstack/neutron-dynamic-routing - - openstack/python-manilaclient - - openstack/tempest - -- job: - name: manila-tempest-minimal-lvm-ipv6-only - parent: manila-tempest-minimal-dsvm-lvm - run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml - required-projects: - - openstack/tempest - - job: name: manila-tox-genconfig parent: openstack-tox @@ -343,7 +62,17 @@ - job: name: manila-rally-no-ss parent: rally-task-manila-no-ss - irrelevant-files: *tempest-irrelevant-files + irrelevant-files: &irrelevant-files + - ^(test-|)requirements.txt$ + - ^.*\.rst$ + - ^api-ref/.*$ + - ^doc/.*$ + - ^manila/hacking/.*$ + - ^manila/tests/.*$ + - ^releasenotes/.*$ + - ^setup.cfg$ + - ^tools/.*$ + - ^tox.ini$ vars: rally_task: rally-jobs/rally-manila-no-ss.yaml devstack_plugins: @@ -354,7 +83,7 @@ - job: name: manila-rally-ss parent: rally-task-manila-ss - irrelevant-files: *tempest-irrelevant-files + irrelevant-files: *irrelevant-files vars: rally_task: rally-jobs/rally-manila.yaml devstack_plugins: