From 12c9974d1e55be6d36290e2d4e8b40089b0550d3 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 27 Sep 2020 10:36:38 +0300 Subject: [PATCH 1/4] v3.2.2 Signed-off-by: Jari Kolehmainen --- lib/pharos/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pharos/version.rb b/lib/pharos/version.rb index b0e6d2f6c..389fe33cd 100644 --- a/lib/pharos/version.rb +++ b/lib/pharos/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Pharos - VERSION = "3.2.1" + VERSION = "3.2.2" def self.version VERSION From ecddd4c3562ac68ebb67c32898cc8ecfea2bd2cc Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sat, 17 Oct 2020 19:06:14 +0300 Subject: [PATCH 2/4] fix travis Signed-off-by: Jari Kolehmainen --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5106de213..cbe03f5d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ bundler_args: --without development before_install: - gem update --system - gem --version - - sudo apt-get update && sudo apt-get install -y libseccomp2 - - sudo systemctl restart docker stages: - name: e2e if: type IN (pull_request, cron) From 1ea3bb64c165527788ab57f4a5c94e918b3027ff Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 18 Oct 2020 09:12:28 +0300 Subject: [PATCH 3/4] fix travis Signed-off-by: Jari Kolehmainen --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbe03f5d0..6d90e73ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,19 @@ stages: jobs: include: - stage: e2e - name: "e2e: bionic docker with weave" + name: "e2e: xenial docker with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=weave - FOOTLOOSE_IMAGE=quay.io/footloose/ubuntu18.04 - stage: e2e - name: "e2e: bionic containerd with weave" + name: "e2e: xenial containerd with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=containerd - NETWORK_PROVIDER=weave @@ -34,7 +34,7 @@ jobs: name: "e2e: focal docker with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=weave @@ -43,16 +43,16 @@ jobs: name: "e2e: focal containerd with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=containerd - NETWORK_PROVIDER=weave - FOOTLOOSE_IMAGE=jakolehm/footloose-ubuntu20.04 - stage: e2e - name: "e2e: bionic docker with calico" + name: "e2e: xenial docker with calico" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=calico @@ -61,7 +61,7 @@ jobs: name: "e2e: focal docker with calico" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=calico @@ -70,7 +70,7 @@ jobs: name: "e2e: centos7 docker with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=weave @@ -79,7 +79,7 @@ jobs: name: "e2e: centos7 containerd with weave" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=containerd - NETWORK_PROVIDER=weave @@ -88,7 +88,7 @@ jobs: name: "e2e: centos7 docker with calico" script: ./e2e/travis.sh rvm: 2.5.4 - dist: bionic + dist: xenial env: - CONTAINER_RUNTIME=docker - NETWORK_PROVIDER=calico From cb076a1d09909a50dabdf45f3abaeea196574580 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 18 Oct 2020 09:18:25 +0300 Subject: [PATCH 4/4] fix travis Signed-off-by: Jari Kolehmainen --- e2e/travis.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/e2e/travis.sh b/e2e/travis.sh index 151f3df7d..98a30277f 100755 --- a/e2e/travis.sh +++ b/e2e/travis.sh @@ -5,9 +5,6 @@ set -ue source ./e2e/util.sh -curl -fsSL https://get.docker.com -o get-docker.sh -sudo sh get-docker.sh - ssh-keygen -t rsa -f ~/.ssh/id_rsa_travis -N "" cat ~/.ssh/id_rsa_travis.pub > ~/.ssh/authorized_keys chmod 0600 ~/.ssh/authorized_keys