Remove beaker

Change-Id: Ie9efc39070db608185a358f817f1074fd4f5810f

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,

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

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

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',

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',

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

playbooks/run-beaker-tests.yaml

@@ -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 <<<y
-          sudo mkdir -p /root/.ssh
-          cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
-          if [[ -f /usr/bin/yum || -f /usr/bin/dnf ]]; then
-              sudo systemctl reload sshd
-          elif [ -f /usr/bin/apt-get ]; then
-              sudo service ssh restart
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-    - name: Run beaker
-      shell:
-        cmd: |
-          trap "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/copy_logs.sh" EXIT
-          if [ "{{ puppet_gem_version }}" != "latest" ]; then
-            export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
-          fi
-          export BEAKER_PUPPET_COLLECTION=puppet5
-          export BEAKER_set=nodepool-{{ nodepool_type }}
-          export BEAKER_debug=yes
-          export BEAKER_color=no
-          if [ -f Modulefile -o -f metadata.json ]; then
-            if [ -f Modulefile ]; then
-              MODULE=$(awk '/^name/ {print $NF}' Modulefile |tr -d \"\')
-            elif [ -f metadata.json ]; then
-              MODULE=$(python -c 'import json;print json.load(open("metadata.json"))["name"]')
-            fi
-            if [ -z "$MODULE" ]; then
-              echo "Module name not defined in Modulefile or metadata.json"
-            else
-              mkdir -p "$MODULE"
-              rsync -a --exclude="$MODULE" --exclude ".*" . "$MODULE"
-              cd "$MODULE"
-            fi
-          fi
-          mkdir .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          export GEM_BIN_DIR=$GEM_HOME/bin
-          if [ -f Gemfile ]; then
-            ruby <<EOF
-          cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
-              cmd += ' -v 1.17.3'
-          end
-          system(cmd)
-          EOF
-            $GEM_BIN_DIR/bundle install --without system_tests --retry 3
-            $GEM_BIN_DIR/bundle exec rspec spec/acceptance
-          else
-            gem install rake -n ./.bundled_gems/ --no-user-instal
-            gem install beaker-rspec --no-user-install
-            gem install puppetlabs_spec_helper --no-user-install
-            ./.bundled_gems/rake acceptance 2>&1 --no-user-install
-          fi
-        chdir: '{{ ansible_user_dir }}/workspace'
-        executable: /bin/bash
-      environment: '{{ zuul | zuul_legacy_vars }}'

playbooks/run-libraries-beaker-tests.yaml

@@ -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 <<<y
-          sudo mkdir -p /root/.ssh
-          cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
-          if [[ -f /usr/bin/yum || -f /usr/bin/dnf ]]; then
-              sudo systemctl reload sshd
-          elif [ -f /usr/bin/apt-get ]; then
-              sudo service ssh restart
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          trap "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/copy_logs.sh" EXIT
-          if [ "{{ puppet_gem_version }}" != "latest" ]; then
-            export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
-          fi
-          export BEAKER_PUPPET_COLLECTION=puppet5
-          export BEAKER_set=nodepool-{{ nodepool_type }}
-          ./run_beaker_tests.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'

run_tests.sh

@@ -293,7 +293,7 @@ uses_debs || echo "test_telemetry_integration" >> /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

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

zuul.d/beaker.yaml

@@ -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

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