From 099722bca4c06a96851d91e1d5d1937331040236 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 21 Sep 2020 20:14:07 +0200 Subject: [PATCH] Remove beaker Change-Id: Ie9efc39070db608185a358f817f1074fd4f5810f --- fixtures/scenario003.pp | 2 +- fixtures/scenario004.pp | 4 +- install_modules.sh | 2 - manifests/ceilometer.pp | 2 +- manifests/redis.pp | 4 +- manifests/repos.pp | 2 +- playbooks/run-beaker-tests.yaml | 70 ----------------------- playbooks/run-libraries-beaker-tests.yaml | 36 ------------ run_tests.sh | 2 +- zuul.d/base.yaml | 43 +------------- zuul.d/beaker.yaml | 55 ------------------ zuul.d/integration.yaml | 6 +- 12 files changed, 12 insertions(+), 216 deletions(-) delete mode 100644 playbooks/run-beaker-tests.yaml delete mode 100644 playbooks/run-libraries-beaker-tests.yaml delete mode 100644 zuul.d/beaker.yaml diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index deeb7b7eb..b7f4a2480 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -120,7 +120,7 @@ class { 'openstack_integration::tempest': horizon => true, murano => $murano_enabled, heat => true, - # NOTE(tobasco): We have tempest disabled because we cannot + # NOTE(tobias-urdin): We have tempest disabled because we cannot # run it when instances does not have internet acces to # deploy for example Docker. magnum => false, diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index b569f49aa..f0d10a947 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -35,9 +35,9 @@ if $::operatingsystem == 'Ubuntu' { $ipv6 = false # Watcher packages are not available in Ubuntu repository. $watcher_enabled = false - # TODO(tobasco): No service plugin 'BGPVPN' + # TODO(tobias-urdin): No service plugin 'BGPVPN' $bgpvpn_enabled = false - # TODO(tobasco): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found. + # TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found. $l2gw_enabled = false # FIXME(ykarel) Disable bgp_dragent until Ubuntu python3 stein(with stein packages) jobs are ready $bgp_dragent_enabled = false diff --git a/install_modules.sh b/install_modules.sh index 2e6e53905..67601bb9c 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -10,11 +10,9 @@ if [ -n "${GEM_HOME}" ]; then GEM_INSTALL_CMD="${GEM_INSTALL_CMD} --install-dir=$GEM_HOME --bindir=${GEM_BIN_DIR}" fi - # NOTE(aschultz): since puppet 3 is now EOL, and beaker-puppet_install_helper # version 0.6.0 has made the agent version the default, we need to symlink # puppet to the /opt/puppetlabs version when specifically not version 3. -# Workaround to deploy puppet for beaker jobs if [ -e /opt/puppetlabs/bin/puppet ]; then export PUPPET_BASE_PATH=/etc/puppetlabs/code export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index e0a652f07..b7d016eae 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -89,7 +89,7 @@ class openstack_integration::ceilometer ( polling_interval => 60, } } else { - # NOTE(tobasco): When running the beaker tests we need to exclude the + # NOTE(tobias-urdin): When running the module tests we need to exclude the # gnocchi resource types since the acceptance test does not setup gnocchi itself. class { 'ceilometer::db::sync': extra_params => '--skip-gnocchi-resource-types', diff --git a/manifests/redis.pp b/manifests/redis.pp index 3f2b573dc..c417184ad 100644 --- a/manifests/redis.pp +++ b/manifests/redis.pp @@ -1,7 +1,7 @@ class openstack_integration::redis { include openstack_integration::config - # NOTE(tobasco): Manually manage redis until arioch/puppet-redis support + # NOTE(tobias-urdin): Manually manage redis until arioch/puppet-redis support # redis 4.x since that is used by Ubuntu Bionic. case $::osfamily { 'Debian': { @@ -28,7 +28,7 @@ class openstack_integration::redis { $service_enable = true } - # NOTE(tobasco): Manually manage redis until arioch/puppet-redis support + # NOTE(tobias-urdin): Manually manage redis until arioch/puppet-redis support # redis 4.x since that is used by Ubuntu Bionic. package { 'redis': ensure => 'present', diff --git a/manifests/repos.pp b/manifests/repos.pp index effeb6367..df4d435cb 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -109,7 +109,7 @@ class openstack_integration::repos { if $::osfamily == 'RedHat' { # NOTE(tobias-urdin): Install libibverbs to fix an issue where OVS outputs errors # that causes the puppet-openvswitch module to fail parsing the output. - # This issue does not occur in integration testing but only beaker tests since some + # This issue does not occur in integration testing but only module tests since some # other package (probably nova) causes this package to be installed, or the yum upgrade # part in integration catches it. # Reported upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1658141 diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml deleted file mode 100644 index c4508bae4..000000000 --- a/playbooks/run-beaker-tests.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- hosts: all - tasks: - - name: Prepare ssh config on the host to run beaker - shell: - cmd: | - echo "" | sudo tee -a /etc/ssh/sshd_config - echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config - echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config - echo "" | sudo tee -a /etc/ssh/sshd_config - echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config - echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config - mkdir -p .ssh - ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P "" -m PEM <<&1 --no-user-install - fi - chdir: '{{ ansible_user_dir }}/workspace' - executable: /bin/bash - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/run-libraries-beaker-tests.yaml b/playbooks/run-libraries-beaker-tests.yaml deleted file mode 100644 index b30d52bbd..000000000 --- a/playbooks/run-libraries-beaker-tests.yaml +++ /dev/null @@ -1,36 +0,0 @@ -- hosts: all - tasks: - - shell: - cmd: | - echo "" | sudo tee -a /etc/ssh/sshd_config - echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config - echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config - echo "" | sudo tee -a /etc/ssh/sshd_config - echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config - echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config - mkdir -p .ssh - ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P "" -m PEM <<> /tmp/openstack/tempest/test-wh # https://bugs.launchpad.net/ironic/+bug/1554237 echo "ironic_tempest_plugin.tests.api.admin.test_drivers" >> /tmp/openstack/tempest/test-whitelist.txt -# NOTE(tobasco): Disabled because magnum network access from inside instance to +# NOTE(tobias-urdin): Disabled because magnum network access from inside instance to # deploy docker for example. # Magnum #echo "test_create_list_sign_delete_clusters" >> /tmp/openstack/tempest/test-whitelist.txt diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index f81acdc3d..e007a9ef5 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -72,7 +72,7 @@ - ^setup.py$ roles: - zuul: zuul/zuul-jobs - # NOTE(tobasco): The ceph variable must be provided with a default here + # NOTE(tobias-urdin): The ceph variable must be provided with a default here # or zuul will complain when it tries to render the run-integration-tests template. vars: ceph: luminous @@ -154,44 +154,3 @@ # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1 vars: rspec_puppet_version: '~> 2.3.0' - -- job: - name: puppet-openstack-beaker-run-base - parent: puppet-openstack-integration-base - abstract: true - pre-run: playbooks/prepare-node-beaker.yaml - post-run: playbooks/upload-logs.yaml - run: playbooks/run-beaker-tests.yaml - timeout: 5400 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^releasenotes/.*$ - - ^spec/unit/.*$ - - ^spec/classes/.*$ - - ^spec/defines/.*$ - - ^requirements.txt$ - - ^test-requirements.txt$ - - ^metadata.json$ - - ^LICENSE$ - - ^.gitignore$ - - ^setup.cfg$ - - ^setup.py$ - -- job: - name: puppet-openstack-beaker-centos-8 - parent: puppet-openstack-beaker-run-base - nodeset: centos-8 - vars: - nodepool_type: centos8 - puppet_gem_version: 6.18 - -- job: - name: puppet-openstack-beaker-ubuntu-bionic - parent: puppet-openstack-beaker-run-base - nodeset: ubuntu-bionic - voting: false - vars: - nodepool_type: bionic - puppet_gem_version: latest diff --git a/zuul.d/beaker.yaml b/zuul.d/beaker.yaml deleted file mode 100644 index 73fe74a61..000000000 --- a/zuul.d/beaker.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project-template: - name: puppet-openstack-beaker-jobs - check: - jobs: - - puppet-openstack-beaker-centos-8 - - puppet-openstack-beaker-ubuntu-bionic - gate: - jobs: - - puppet-openstack-beaker-centos-8 - -- job: - name: puppet-openstack-libraries-puppet-beaker-rspec-centos-8 - parent: puppet-openstack-integration-base - pre-run: playbooks/prepare-node-beaker.yaml - post-run: playbooks/upload-logs.yaml - run: playbooks/run-libraries-beaker-tests.yaml - timeout: 3600 - nodeset: centos-8 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - ^LICENSE$ - - ^.gitignore$ - vars: - nodepool_type: centos8 - puppet_gem_version: 6.18.0 - -- job: - name: puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic - parent: puppet-openstack-integration-base - pre-run: playbooks/prepare-node-beaker.yaml - post-run: playbooks/upload-logs.yaml - run: playbooks/run-libraries-beaker-tests.yaml - timeout: 3600 - voting: false - nodeset: ubuntu-bionic - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - ^LICENSE$ - - ^.gitignore$ - vars: - nodepool_type: bionic - puppet_gem_version: latest diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index 0c22290b7..4f93dd906 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -46,7 +46,7 @@ parent: puppet-openstack-integration-6-scenario002 nodeset: ubuntu-bionic voting: false - # NOTE(tobasco): Should normally not really pass mimic ceph var here but since + # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since # luminous is not packaged for Bionic repos.pp will fail otherwise. vars: ceph: mimic @@ -75,7 +75,7 @@ parent: puppet-openstack-integration-6-scenario003 nodeset: ubuntu-bionic voting: false - # NOTE(tobasco): Should normally not really pass mimic ceph var here but since + # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since # luminous is not packaged for Bionic repos.pp will fail otherwise. vars: ceph: mimic @@ -105,7 +105,7 @@ parent: puppet-openstack-integration-6-scenario004 nodeset: ubuntu-bionic voting: false - # NOTE(tobasco): Should normally not really pass mimic ceph var here but since + # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since # luminous is not packaged for Bionic repos.pp will fail otherwise. vars: ceph: mimic