From b8431690ceb518fec691da5f930a6cb2a6e03693 Mon Sep 17 00:00:00 2001
From: Rohit Kumar <rohit.ro.kumar@oracle.com>
Date: Fri, 11 Oct 2019 10:44:34 -0700
Subject: [PATCH 1/5] fix release script to push version tags in correct format

---
 release.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/release.sh b/release.sh
index 60dc644..0ab8a04 100755
--- a/release.sh
+++ b/release.sh
@@ -22,12 +22,11 @@ echo "New version: $new_version"
 
 echo "VERSION = '${new_version}'" > fdk/version.py
 
-tag="$new_version"
+tag="v$new_version"
 git add -u
-git commit -m "FDK Python: $new_version release [skip ci]"
-git tag -f -a $tag -m "version $new_version"
-git push
-git push origin $tag
+git commit -m "FDK Python: v$new_version release [skip ci]"
+git tag -f -a $tag -m "version v$new_version"
+git push --tags origin master
 
 PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
 twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*

From 4c40983f2effc67d93f21d2a7f7fab2187c88efe Mon Sep 17 00:00:00 2001
From: Rohit Kumar <rohit.ro.kumar@oracle.com>
Date: Fri, 11 Oct 2019 10:53:33 -0700
Subject: [PATCH 2/5] fix for free-plan-docker-layer-caching-unavailable error
 on circleci

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ba0daa..8f5d3f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
       - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - run:
           command: |
             sudo pip install twine

From fcb0410e3567750e460a486602eb730fda989f78 Mon Sep 17 00:00:00 2001
From: Rohit Kumar <rohit.ro.kumar@oracle.com>
Date: Fri, 11 Oct 2019 10:59:15 -0700
Subject: [PATCH 3/5] fix for free-plan-docker-layer-caching-unavailable error
 on circleci

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f5d3f5..4113efa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,8 +40,6 @@ jobs:
       - checkout
       - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
-      - setup_remote_docker:
-          docker_layer_caching: false
       - run:
           command: |
             sudo pip install twine

From 6add27fc994a122ce62d6e664002661a4e92e093 Mon Sep 17 00:00:00 2001
From: Rohit Kumar <rohit.ro.kumar@oracle.com>
Date: Fri, 11 Oct 2019 11:18:44 -0700
Subject: [PATCH 4/5] backout fix for
 free-plan-docker-layer-caching-unavailable error on circleci

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4113efa..9ba0daa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,6 +40,8 @@ jobs:
       - checkout
       - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+      - setup_remote_docker:
+          docker_layer_caching: true
       - run:
           command: |
             sudo pip install twine

From e54b26128982aae7daaa6920f90b54c1b40d9851 Mon Sep 17 00:00:00 2001
From: Rohit Kumar <rohit.ro.kumar@oracle.com>
Date: Fri, 11 Oct 2019 14:07:44 -0700
Subject: [PATCH 5/5] fix for free-plan-docker-layer-caching-unavailable error
 on circleci

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ba0daa..aa073aa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - run:
           command: |
             python3 -m venv venv
@@ -41,7 +41,7 @@ jobs:
       - restore_cache:
           key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - run:
           command: |
             sudo pip install twine
@@ -65,7 +65,7 @@ jobs:
     working_directory: ~/fdk-python
     steps:
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - checkout
       - run:
           name: Python 3.6 build
@@ -84,7 +84,7 @@ jobs:
     working_directory: ~/fdk-python
     steps:
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - checkout
       - run:
           name: Python 3.7.1 build