summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-11-21 21:50:42 -0500
committerFeng Pan <fpan@redhat.com>2016-11-21 21:50:42 -0500
commit113fd0b6d0120d5e2e302ee1e134832b38b062bc (patch)
tree8a1f6a3ae2a323dd97316a0ab674270d4c4020d9
parent1a4800952c56743ac8070d3051f423b7bf3bb8c5 (diff)
puppet-fdio: move most test logic into repo
Change-Id: I3ff8d1f1b19d201b8af088afaba05ca7e4ec81a0 Signed-off-by: Feng Pan <fpan@redhat.com>
-rw-r--r--jjb/puppet-fdio/puppet-fdio.yaml65
1 files changed, 5 insertions, 60 deletions
diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index 82edfea40..fd1b214d7 100644
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -51,18 +51,9 @@
branch: '{branch}'
builders:
- - puppet-prepare-node
- shell: |
- if [ "{puppet_version}" != "latest" ]; then
- export PUPPET_GEM_VERSION='~> {puppet_version}.0'
- fi
- mkdir .bundled_gems
- export GEM_HOME=`pwd`/.bundled_gems
- gem install bundler --no-rdoc --no-ri --verbose
- $GEM_HOME/bin/bundle install --retry 3
- $GEM_HOME/bin/bundle exec rake syntax
- $GEM_HOME/bin/bundle exec rake lint
- $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
+ ./scripts/prepare-node.sh
+ ./scripts/ci-unit-tests.sh {puppet_version}
- job-group:
name: 'puppet-module-unit'
@@ -114,53 +105,7 @@
branch: '{branch}'
builders:
- - puppet-prepare-node
- - allow-local-ssh-root
- shell: |
- sudo sysctl -w vm.nr_hugepages=1024
- cat /proc/meminfo | grep Huge
- mkdir .bundled_gems
- export GEM_HOME=`pwd`/.bundled_gems
- gem install bundler --no-rdoc --no-ri --verbose
- $GEM_HOME/bin/bundle install --retry 3
- export BEAKER_set=nodepool-{os}
- export BEAKER_debug=yes
- export BEAKER_color=no
- $GEM_HOME/bin/bundle exec rspec spec/acceptance
-
-- builder:
- name: puppet-prepare-node
- builders:
- - shell: |
- if [ -f /usr/bin/yum ]; then
- sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
- elif [ -f /usr/bin/apt-get ]; then
- sudo apt-get update
- sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev
- fi
-
-- builder:
- name: allow-local-ssh-root
- builders:
- - shell: |
- 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
- if [ ! -f ~/.ssh/id_rsa.pub ]; then
- if [ -f ~/.ssh/id_rsa ]; then
- ssh-keygen -y -f ~/.ssh/id_rsa -b 2048 -P "" > ~/.ssh/id_rsa.pub
- else
- ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
- fi
- fi
- sudo mkdir -p /root/.ssh
- cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
- if [ -f /usr/bin/yum ]; then
- sudo systemctl restart sshd
- elif [ -f /usr/bin/apt-get ]; then
- sudo service ssh restart
- fi
+ ./scripts/prepare-node.sh
+ ./scripts/allow-local-ssh-root.sh
+ ./scripts/ci-beaker.sh {os}