Api fix and CI cleanup (#78)

* Api fix and CI cleanup

* update json

Author: rockb1017

.circleci/build_and_push_to_dockerhub.sh

@@ -66,47 +66,6 @@ jobs:
           name: trigger
           command: |
             .circleci/trigger_func_test.sh develop
-  release:
-    docker:
-      - image: circleci/ruby:2.6.1-node-browsers
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: /tmp
-      - checkout
-      - setup_remote_docker:
-          reusable: true
-      - run:
-          name: Install dependencies
-          command: |
-            .circleci/install_dep.sh
-      - run:
-          name: Build and push docker image to dockerhub
-          command: |
-            .circleci/build_and_push_to_dockerhub.sh
-      - run:
-          name: Upload gem to Github
-          command: |
-            .circleci/build_and_push_to_github_release.sh
-      - run:
-          name: Upload gem to Ruby Gem
-          command: |
-            .circleci/push_gems_to_rubygems.sh
-
-  check_version:
-    docker:
-      - image: circleci/ruby:2.6.1-node-browsers
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: /tmp
-      - checkout          
-      - setup_remote_docker:
-          reusable: true
-      - run:
-          name: Check VERSION file for change
-          command: |
-            .circleci/check_version_trigger_release.sh
 
 workflows:
   version: 2
@@ -126,28 +85,4 @@ workflows:
             - unit_test
       - func_test_develop:
           requires:
-            - unit_test
-      - check_version:
-          requires:
-            - unit_test
-          filters:
-            branches:
-              only: develop
-  release:
-    jobs:
-      - build:
-          filters:
-            branches:
-              only: master
-      - unit_test:
-          requires:
-            - build
-      - func_test_master:
-          requires:
-            - unit_test
-      - func_test_develop:
-          requires:
-            - unit_test
-      - release:
-          requires:
-            - unit_test
+            - unit_test

.circleci/build_and_push_to_github_release.sh

@@ -11,6 +11,7 @@ curl -X POST --header "Content-Type: application/json" \
     -d '{"build_parameters": {"CIRCLE_JOB":"build_test", "TRIG_BRANCH":"'"$CIRCLE_BRANCH"'", "TRIG_PROJECT":"'"$CIRCLE_PROJECT_REPONAME"'", "TRIG_REPO":"'"$CIRCLE_REPOSITORY_URL"'"}}' "https://circleci.com/api/v1/project/$ORGANIZATION/$PROJECT/tree/$BRANCH?circle-token=$CIRCLE_TOKEN" > build.json
 cat build.json
 BUILD_NUM=$(jq -r .build_num build.json)
+sleep 10
 
 # Wait until finish or maximum 20 minutes
 TIMEOUT=20

.circleci/check_version_trigger_release.sh

@@ -46,7 +46,7 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
-    json (2.1.0)
+    json (2.3.1)
     kubeclient (4.6.0)
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)

.circleci/config.yml

@@ -1,9 +1,15 @@
 VERSION := $(shell sh -c 'cat VERSION')
 
-clean: 
-	@rm -rf pkg/* docker/gem/ docker/gems/ docker/*.gem docker/licenses
+clean_pkg: 
+	@rm -rf pkg/* docker/*.gem 
 
-build: clean 
+clean_gems:
+	@rm -rf docker/gem/ docker/gems/
+
+clean: clean_pkg clean_gems
+	@rm -rf docker/licenses
+
+build: clean_pkg 
 	@bundle exec rake build
 
 docker: build install-deps
@@ -18,4 +24,9 @@ unit-test:
 install-deps:
 	@gem install bundler
 	@bundle update --bundler
-	@bundle install
+	@bundle install
+
+unpack: build
+	@cp pkg/fluent-plugin-*.gem docker
+	@gem unpack docker/fluent-plugin-*.gem --target docker/gem
+	@cd docker && bundle install