Merge pull request #303 from hurricanehrndz/master

Fixing issues with bundler
6 years ago · bcef774735
parent 4aa7dd2896 6fe8dbff2b
commit bcef774735
4 changed files with 62 additions and 93 deletions
--- a/.ci/before_script.sh
+++ b/.ci/before_script.sh
@ -5,13 +5,11 @@ set -e
 # Linux helper functions:
 function update_linux() {
  sudo apt-get update -qq
-  sudo apt-get install -qq python-apt python-pycurl git python-pip ruby ruby-dev build-essential autoconf rpm
-  gem install bundler
+  sudo apt-get install -qq python-apt python-pycurl git python-pip build-essential autoconf rpm
 }

 function install_ansible {
  bash .ci/ansible-setup.sh
-  bundle install
  # pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error
  ~/.avm/v2.3/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
  ~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint   pyOpenSSL ndg-httpsclient pyasn1
--- a/.ci/integration/gnupg-git/default.yml
+++ b/.ci/integration/gnupg-git/default.yml
@ -70,52 +70,32 @@
      when:
        - ansible_os_family == "RedHat"

-    - name: Get GnuPG github api content
-      uri:
-        url: https://api.github.com/repos/gpg/gnupg/tags
-        method: GET
-        return_content: yes
-        body_format: json
-      register: gnupg_tags
-
-    - name: Set url for latest gnupg release source
-      set_fact:
-        gnupg_tarball_url: >-
-          {{
-            gnupg_tags.json |
-            selectattr('name','match','gnupg-2.*') |
-            map(attribute='tarball_url') | first
-          }}
-
-    - name: Download latest release of gnupg source
-      get_url:
-        url: "{{ gnupg_tarball_url }}"
-        dest: /tmp/gnupg.tar.gz
-        force: yes
-      retries: 5
-      delay: 10
-
    - name: Make directory /usr/local/src/ for Alpine based distros
      command: bash -lc "mkdir -p /usr/local/src/"
      when:
        - ansible_os_family == "Alpine"

-    - name: Extract gnupg source tarball
-      unarchive:
-        src: /tmp/gnupg.tar.gz
-        dest: /usr/local/src/
-
-    - name: Find gnupg src directory
-      find:
-        paths: /usr/local/src
-        patterns: "gpg-gnupg*"
-        file_type: directory
-        recurse: no
-      register: found_gpg_src
-
    - name: Set gnupg src directory
      set_fact:
-        gpg_src_path: "{{ found_gpg_src.files | map(attribute='path') | first }}"
+        gpg_src_path: /usr/local/src/gpg-gnupg
+
+    - name: Get GnuPG from github
+      git:
+        repo: 'https://github.com/gpg/gnupg.git'
+        dest: "{{ gpg_src_path }}"
+        update: true
+
+    - name: get latest tag name
+      shell: "git describe --tags `git rev-list --tags --max-count=1`"
+      args:
+        chdir: "{{ gpg_src_path }}"
+      register: latest_tag
+
+    - name: Checkout latest tag
+      git:
+        repo: 'https://github.com/gpg/gnupg.git'
+        dest: "{{ gpg_src_path }}"
+        version: "{{ latest_tag.stdout }}"

    - name: Run gnupg autogen
      command: bash -lc "cd {{ gpg_src_path }} && ./autogen.sh "
--- a/.kitchen.yml
+++ b/.kitchen.yml
@ -25,13 +25,11 @@ transport:
  max_ssh_sessions: 3

 platforms:
-  - name: debian-latest
+  - name: alpine-latest
    driver_config:
-      run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/debian/latest/Dockerfile
-      platform: debian
-      cap_add:
-        - SYS_ADMIN
+      run_command: /sbin/init
+      dockerfile: .Dockerfiles/alpine/latest/Dockerfile
+      platform: alpine
      volume:
        - /sys/fs/cgroup:/sys/fs/cgroup:ro
        - <%=ENV['PWD']%>:/opt/workspace # Make the working directory available inside the container
@ -40,11 +38,11 @@ platforms:
          - /run
          - /run/lock

-  - name: fedora-latest
+  - name: debian-latest
    driver_config:
      run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/fedora/latest/Dockerfile
-      platform: fedora
+      dockerfile: .Dockerfiles/debian/latest/Dockerfile
+      platform: debian
      cap_add:
        - SYS_ADMIN
      volume:
@ -55,11 +53,11 @@ platforms:
          - /run
          - /run/lock

-  - name: centos-latest
+  - name: fedora-latest
    driver_config:
      run_command: /lib/systemd/systemd
-      dockerfile: .Dockerfiles/centos/latest/Dockerfile
-      platform: centos
+      dockerfile: .Dockerfiles/fedora/latest/Dockerfile
+      platform: fedora
      cap_add:
        - SYS_ADMIN
      volume:
@ -100,19 +98,6 @@ platforms:
          - /run
          - /run/lock

-  - name: alpine-latest
-    driver_config:
-      run_command: /sbin/init
-      dockerfile: .Dockerfiles/alpine/latest/Dockerfile
-      platform: alpine
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-        - <%=ENV['PWD']%>:/opt/workspace # Make the working directory available inside the container
-      run_options:
-        tmpfs:
-          - /run
-          - /run/lock
-
 verifier:
  name: serverspec
  sudo_path: true
@ -131,14 +116,12 @@ suites:
      patterns:
        - roles/git-secret/.ci/integration/gnupg2/serverspec/*_spec.rb
    excludes:
-      - ubuntu-latest
+      - centos-latest
  - name: gnupg-git
    verifier:
      patterns:
        - roles/git-secret/.ci/integration/gnupg-git/serverspec/*_spec.rb
-      bundler_path: '/usr/local/bin'
-      rspec_path: '/usr/local/bin'
    excludes:
-      - ubuntu-latest
      - centos-latest
      - alpine-latest
+      - debian-latest
--- a/.travis.yml
+++ b/.travis.yml
@ -1,89 +1,97 @@
+dist: xenial
+
 matrix:
  fast_finish: true
  include:
-    - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
-      services: docker
-      sudo: required
-      language: ruby
-      rvm: 2.4
    - os: linux
      env: KITCHEN_REGEXP="gnupg1-alpine-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg1-debian-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg1-fedora-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg1-ubuntu-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg1-ubuntu-rolling"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg2-alpine-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
+    # distribute deb on this successful test
    - os: linux
      env: KITCHEN_REGEXP="gnupg2-debian-latest"; GITSECRET_DIST="deb"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
+    # distribute rpm on this successful test
    - os: linux
      env: KITCHEN_REGEXP="gnupg2-fedora-latest"; GITSECRET_DIST="rpm"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
-      env: KITCHEN_REGEXP="gnupg2-centos-latest"
+      env: KITCHEN_REGEXP="gnupg2-ubuntu-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg2-ubuntu-rolling"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-debian-latest"; GITSECRET_DIST="make"
+      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
+      services: docker
+      sudo: required
+      language: ruby
+      rvm: 2.6
+    - os: linux
+      env: KITCHEN_REGEXP="gnupg-git-ubuntu-latest"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: linux
      env: KITCHEN_REGEXP="gnupg-git-ubuntu-rolling"
      services: docker
      sudo: required
      language: ruby
-      rvm: 2.4
+      rvm: 2.6
    - os: osx
      env: GITSECRET_DIST="brew"
      sudo: required
      language: ruby
-      rvm: 2.4      
+      rvm: 2.6
+
+before_install:
+  - gem update --system
+  - gem install bundler

 before_script:
  - chmod +x ".ci/before_script.sh" && ".ci/before_script.sh"
@ -122,4 +130,4 @@ after_deploy:
 notifications:
  email:
    on_success: never
-    on_failure: change
+    on_failure: change