Merge branch '2016.11' into issue-39901

2025-04-17 10:10:20 +00:00 · 2017-10-25 11:17:57 -06:00 · 2017-10-25 11:17:57 -06:00 · 613d500876
commit 613d500876
parent b97e8046ca 8a1ea165af
6 changed files with 273 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -87,3 +87,8 @@ tests/integration/cloud/providers/logs

 # Private keys from the integration tests
 tests/integration/cloud/providers/pki/minions
+
+# Ignore kitchen stuff
+.kitchen
+.bundle
+Gemfile.lock
--- a/.kitchen.yml
+++ b/.kitchen.yml
@ -0,0 +1,175 @@
+---
+<% vagrant = system('which vagrant 2>/dev/null >/dev/null') %>
+<% version = '2016.11.8' %>
+<% platformsfile = ENV['SALT_KITCHEN_PLATFORMS'] || '.kitchen/platforms.yml' %>
+<% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %>
+
+<% if File.exists?(driverfile) %>
+<%= File.read(driverfile) %>
+<% else %>
+driver:
+  name: docker
+  use_sudo: false
+  privileged: true
+  username: root
+  volume:
+    - /var/run/docker.sock:/docker.sock
+  cap_add:
+    - sys_admin
+  disable_upstart: false
+  provision_command:
+    - echo 'L /run/docker.sock - - - - /docker.sock' > /etc/tmpfiles.d/docker.conf
+<% end %>
+
+sudo: false
+provisioner:
+  name: salt_solo
+  salt_install: bootstrap
+  salt_version: latest
+  salt_bootstrap_url: https://bootstrap.saltstack.com
+  salt_bootstrap_options: -X stable <%= version %>
+  log_level: info
+  require_chef: false
+  remote_states:
+    name: git://github.com/gtmanfred/salt-jenkins.git
+    branch: 2016.11
+    repo: git
+    testingdir: /testing
+  salt_copy_filter:
+    - .bundle
+    - .git
+    - .gitignore
+    - .kitchen
+    - .kitchen.yml
+    - Gemfile
+    - Gemfile.lock
+    - README.rst
+    - .travis.yml
+  state_top:
+    base:
+      "*":
+        - git.salt
+        - kitchen
+<% if File.exists?(platformsfile) %>
+<%= File.read(platformsfile) %>
+<% else %>
+platforms:
+  - name: fedora
+    driver_config:
+      image: fedora:latest
+      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -X git v<%= version %> >/dev/null
+  - name: centos-7
+    driver_config:
+      run_command: /usr/lib/systemd/systemd
+  - name: centos-6
+    driver_config:
+      run_command: /sbin/init
+      provision_command:
+        - yum install -y upstart
+    provisioner:
+      salt_bootstrap_options: -P -y -x python2.7 -X git v<%= version %> >/dev/null
+  - name: ubuntu-rolling
+    driver_config:
+      image: ubuntu:rolling
+      run_command: /lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh
+  - name: ubuntu-16.04
+    driver_config:
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-14.04
+    driver_config:
+      run_command: /sbin/init
+      provision_command:
+        - rm -f /sbin/initctl
+        - dpkg-divert --local --rename --remove /sbin/initctl
+  - name: debian-8
+    driver_config:
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - apt-get install -y dbus
+        - echo 'L /run/docker.sock - - - - /docker.sock' > /etc/tmpfiles.d/docker.conf
+  - name: debian-9
+    driver_config:
+      run_command: /lib/systemd/systemd
+  - name: arch
+    driver_config:
+      image: base/archlinux
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - pacman -Syu --noconfirm systemd
+        - systemctl enable sshd
+        - echo 'L /run/docker.sock - - - - /docker.sock' > /etc/tmpfiles.d/docker.conf
+    provisioner:
+      salt_bootstrap_options: -X git v<%= version %> >/dev/null
+  - name: opensuse
+    driver_config:
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - systemctl enable sshd.service
+        - echo 'L /run/docker.sock - - - - /docker.sock' > /etc/tmpfiles.d/docker.conf
+    provisioner:
+      salt_bootstrap_options: -X git v<%= version %> >/dev/null
+<% if vagrant != false %>
+  - name: windows-2012r2
+    driver:
+      box: mwrock/Windows2012R2
+      communicator: winrm
+      name: vagrant
+      gui: true
+      username: administrator
+      password: Pass@word1
+    provisioner:
+      init_environment: |
+        Clear-Host
+        $AddedLocation ="c:\salt"
+        $Reg = "Registry::HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+        $OldPath = (Get-ItemProperty -Path "$Reg" -Name PATH).Path
+        $NewPath= $OldPath + ’;’ + $AddedLocation
+        Set-ItemProperty -Path "$Reg" -Name PATH –Value $NewPath
+      salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
+      salt_bootstrap_options: ''
+  - name: windows-2016
+    driver:
+      box: mwrock/Windows2016
+      communicator: winrm
+      name: vagrant
+      username: Vagrant
+      password: vagrant
+      gui: true
+    provisioner:
+      init_environment: |
+        Clear-Host
+        $AddedLocation ="c:\salt;c:\salt\bin\Scripts"
+        $Reg = "Registry::HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+        $OldPath = (Get-ItemProperty -Path "$Reg" -Name PATH).Path
+        $NewPath= $OldPath + ’;’ + $AddedLocation
+        Set-ItemProperty -Path "$Reg" -Name PATH –Value $NewPath
+      salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
+      salt_bootstrap_options: ''
+<% end %>
+<% end %>
+suites:
+  - name: py2
+    provisioner:
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - jenkins
+        jenkins.sls:
+          testing_dir: /tmp/kitchen/testing
+          clone_repo: false
+          salttesting_namespec: salttesting==2017.6.1
+verifier:
+  name: shell
+  remote_exec: true
+  sudo: false
+  live_stream: {}
+<% if ENV['TESTOPTS'].nil? %>
+  command: '$(kitchen) /tmp/kitchen/testing/tests/runtests.py --run-destructive --sysinfo --transport=zeromq --output-columns=80 --ssh --coverage-xml=/tmp/coverage.xml --xml=/tmp/xml-unittests-output'
+<% else %>
+  command: '$(kitchen) /tmp/kitchen/testing/tests/runtests.py --run-destructive --output-columns 80 <%= ENV["TESTOPTS"] %>'
+<% end %>
--- a/23
+++ b/23
@ -0,0 +1,23 @@
+# This file is only used for running the test suite with kitchen-salt.
+
+source "https://rubygems.org"
+
+gem "test-kitchen"
+gem "kitchen-salt", :git => 'https://github.com/gtmanfred/kitchen-salt.git'
+gem 'git'
+
+group :docker do
+  gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git'
+end
+
+group :opennebula do
+  gem 'kitchen-opennebula', :git => 'https://github.com/gtmanfred/kitchen-opennebula.git'
+  gem 'xmlrpc'
+end
+
+group :windows do
+  gem 'vagrant-wrapper'
+  gem 'kitchen-vagrant'
+  gem 'winrm', '~>2.0'
+  gem 'winrm-fs', '~>1.0'
+end
--- a/salt/modules/win_lgpo.py
+++ b/salt/modules/win_lgpo.py
@ -5339,7 +5339,7 @@ def set_(computer_policy=None, user_policy=None,
                                    _regedits[regedit]['policy']['Registry']['Type'])
                        else:
                            _ret = __salt__['reg.delete_value'](
-                                    _regedits[regedit]['polic']['Registry']['Hive'],
+                                    _regedits[regedit]['policy']['Registry']['Hive'],
                                    _regedits[regedit]['policy']['Registry']['Path'],
                                    _regedits[regedit]['policy']['Registry']['Value'])
                        if not _ret:
--- a/salt/utils/gitfs.py
+++ b/salt/utils/gitfs.py
@ -437,7 +437,7 @@ class GitProvider(object):
            return root_dir
        log.error(
            'Root path \'%s\' not present in %s remote \'%s\', '
-            'skipping.', self.root, self.role, self.id
+            'skipping.', self.root(), self.role, self.id
        )
        return None

--- a/tests/support/copyartifacts.py
+++ b/tests/support/copyartifacts.py
@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+'''
+Script for copying back xml junit files from tests
+'''
+from __future__ import absolute_import
+import argparse  # pylint: disable=minimum-python-version
+import os
+import paramiko
+import subprocess
+import yaml
+
+
+class DownloadArtifacts(object):
+    def __init__(self, instance, artifacts):
+        self.instance = instance
+        self.artifacts = artifacts
+        self.client = self.setup_transport()
+
+    def setup_transport(self):
+        # pylint: disable=minimum-python-version
+        config = yaml.load(subprocess.check_output(['bundle', 'exec', 'kitchen', 'diagnose', self.instance]))
+        # pylint: enable=minimum-python-version
+        state = config['instances'][self.instance]['state_file']
+        tport = config['instances'][self.instance]['transport']
+        transport = paramiko.Transport((
+            state['hostname'],
+            state.get('port', tport.get('port', 22))
+        ))
+        pkey = paramiko.rsakey.RSAKey(
+            filename=state.get('ssh_key', tport.get('ssh_key', '~/.ssh/id_rsa'))
+        )
+        transport.connect(
+            username=state.get('username', tport.get('username', 'root')),
+            pkey=pkey
+        )
+        return paramiko.SFTPClient.from_transport(transport)
+
+    def download(self):
+        for remote, local in self.artifacts:
+            if remote.endswith('/'):
+                for fxml in self.client.listdir(remote):
+                    self._do_download(os.path.join(remote, fxml), os.path.join(local, os.path.basename(fxml)))
+            else:
+                self._do_download(remote, os.path.join(local, os.path.basename(remote)))
+
+    def _do_download(self, remote, local):
+        print('Copying from {0} to {1}'.format(remote, local))
+        self.client.get(remote, local)
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Jenkins Artifact Download Helper')
+    parser.add_argument(
+        '--instance',
+        required=True,
+        action='store',
+        help='Instance on Test Kitchen to pull from',
+    )
+    parser.add_argument(
+        '--download-artifacts',
+        dest='artifacts',
+        nargs=2,
+        action='append',
+        metavar=('REMOTE_PATH', 'LOCAL_PATH'),
+        help='Download remote artifacts',
+    )
+    args = parser.parse_args()
+    downloader = DownloadArtifacts(args.instance, args.artifacts)
+    downloader.download()