Merge pull request #44 from 3scale/v2-stable-bump

bump version v2.1.0
3scale-labs · May 26, 2020 · 608150c · 608150c
2 parents d86efe4 + e760b3a
commit 608150c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ threescale_portal_endpoint: <THREESCALE_PORTAL_ENDPOINT>
 # Used traffic for performance testing is not real traffic.
 # It is synthetically generated traffic based on traffic models.
 # Information about available traffic profiles (or test plans) can be found here:
-# https://github.com/3scale/perftest-toolkit/blob/master/buddhi/README.md#profiles
+# https://github.com/3scale/perftest-toolkit/tree/v2-stable/buddhi/README.md#profiles
 # Currently available profiles: [ simple | backend | standard ]
 traffic_profile: <TRAFFIC_PROFILE>
 

diff --git a/buddhi/Makefile b/buddhi/Makefile
@@ -1,6 +1,6 @@
-IMAGE_TAG ?= master
+IMAGE_TAG ?= v2.1.0
 IMAGE_NAME ?= perftest-toolkit:$(IMAGE_TAG)
-LATEST_IMAGE ?= perftest-toolkit:latest
+LATEST_IMAGE ?= perftest-toolkit:v2-latest
 REGISTRY ?= quay.io/3scale
 
 .PHONY: build, push, bash, deps, test, clean

diff --git a/buddhi/README.md b/buddhi/README.md
@@ -15,7 +15,7 @@ $ cat traffic.csv
 ## Usage
 
 ```shell
-docker run --rm quay.io/3scale/perftest-toolkit:master -h
+docker run --rm quay.io/3scale/perftest-toolkit:v2.1.0 -h
 usage: buddhi [options]
     -P, --portal    Admin portal endpoint
     -s, --services  3scale service list

diff --git a/buddhi/lib/amp/toolkit/buddhi/version.rb b/buddhi/lib/amp/toolkit/buddhi/version.rb
@@ -1,7 +1,7 @@
 module AMP
   module Toolkit
     module Buddhi
-      VERSION = '2.0.0'.freeze
+      VERSION = '2.1.0'.freeze
     end
   end
 end
diff --git a/deployment/roles/profiled-traffic-generator/defaults/main.yml b/deployment/roles/profiled-traffic-generator/defaults/main.yml
@@ -10,7 +10,7 @@ threescale_portal_endpoint: <THREESCALE_PORTAL_ENDPOINT>
 # Used traffic for performance testing is not real traffic.
 # It is synthetically generated traffic based on traffic models.
 # Information about available traffic profiles (or test plans) can be found here:
-# https://github.com/3scale/perftest-toolkit/blob/master/buddhi/README.md#profiles
+# https://github.com/3scale/perftest-toolkit/tree/v2-stable/buddhi/README.md#profiles
 # Currently available profiles: [ simple | backend | standard ]
 traffic_profile: <TRAFFIC_PROFILE>
 

diff --git a/deployment/roles/profiled-traffic-generator/tasks/main.yml b/deployment/roles/profiled-traffic-generator/tasks/main.yml
@@ -17,7 +17,7 @@
     user: root
     tty: True
     detach: no
-    image: quay.io/3scale/perftest-toolkit:master
+    image: quay.io/3scale/perftest-toolkit:v2-latest
     command: "--portal {{ threescale_portal_endpoint }} --profile \"{{ traffic_profile }}\" --endpoint \"{{ private_base_url }}\" -o /traffic/traffic.csv"
     volumes:
       - "{{ tempdir_1.path }}:/traffic"

diff --git a/deployment/roles/user-traffic-reader/tasks/main.yml b/deployment/roles/user-traffic-reader/tasks/main.yml
@@ -17,7 +17,7 @@
     user: root
     tty: True
     detach: no
-    image: quay.io/3scale/perftest-toolkit:master
+    image: quay.io/3scale/perftest-toolkit:v2-latest
     command: "--portal {{ threescale_portal_endpoint }} --services \"{{ threescale_services }}\" -o /traffic/traffic.csv"
     volumes:
       - "{{ tempdir_1.path }}:/traffic"