continuous_integration 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f887e62539b001ed8a91792715575bf11eb611
-  data.tar.gz: de448300183180273b068b45c0ac5fe759d2c3f8
+  metadata.gz: 6861ebf56ab9b7be83c9427a3da27c130011875b
+  data.tar.gz: 67d6efd2f9c89bf471360447e36bd8c8045b5cb5
 SHA512:
-  metadata.gz: 02c49139bfa3d11fffdaec5780a900f39c214ff9591e8347f308aea3da730f0545359b9a84005d2e1f5b1b2f419c9c70fabeb3b2f8b322de92400706602a6439
-  data.tar.gz: 1dccc2de883ba08661d5fa997f9e470bc5067229338a7723949044e7ee94e27124c68ce25b3129a35990f274a395cf99280b1004ac887fed12dd55475a74a9d1
+  metadata.gz: 46cd6111bd9bd741e2c42dde0d60cab58be5cc63f0b25080e908d92edad72e29de4faadf9f26c0cd08897adfefd3ee8566555dbf4c4848fc2da025b692c9934b
+  data.tar.gz: 2af7be57a2894f0576525871ba3496d1bd9a2d37d40a514ba0720f89cf69a611bd3283e0cb529e921a184e24cdddf5296c5959e61f8409e17dbee07657d3c4e5

data/lib/continuous_integration/tasks.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require_relative 'constants'
 
 # Class to perform operations on receiving http calls
@@ -12,7 +11,7 @@ class DockerEndpoint < WEBrick::HTTPServlet::AbstractServlet
     @result_api = ''
     @result_ui = ''
     @git_branch = ''
-    @lock = true
+		@response = ''
   end
 
   # curl localhost:8080/docker
@@ -31,36 +30,57 @@ class DockerEndpoint < WEBrick::HTTPServlet::AbstractServlet
     @git_branch = request_hash[:trigger_metadata][:ref]
     @git_branch = @git_branch.split('/')
     @git_branch = @git_branch.last
-    perform_operations
 
+		#loop in case already processing a request
+		while true
+			if $LOCK
+				sleep 10
+				puts "Waiting"
+			else
+				puts "File not there"
+				break
+			end
+		end
+
+		perform_operations
+
+    _response.body = JSON.generate @response
+    _response['Content-Type'] = 'application/json'
+		
     rescue StandardError => error
-	    print "Not a valid Quay post " + error.to_s
+			
+			#unset lock on exceptions
+			$LOCK = false
+
+			print "Not a valid Quay post " + error.to_s
     end
   end
 
   # method to perform various CI operations
-  def perform_operations
-    # handle requests one at a time (to avoid concurrency) - Needs testing
-    while @lock
-      @lock = true
-      docker_update
-      sleep 10
-
-      run_api_tests
-      run_ui_tests
-      generate_log
-      slack_post
-      @lock = false
-    end
-  end
+	def perform_operations
+
+		#set lock
+		$LOCK = true
+
+		docker_update
+		sleep 10
+
+		run_api_tests
+		run_ui_tests
+		generate_log
+		slack_post
+
+		#unset lock
+		$LOCK = false
+	end
 
   # update docker images locally
   def docker_update
     Dir.chdir(DOCKER_PATH) do
       # perform docker images update
-      `sudo docker compose kill`
-      `sudo docker compose rm`
-      `sudo docker compose up -d`
+      `sudo docker-compose kill`
+      `sudo docker-compose rm`
+      `sudo docker-compose up -d`
     end
   end
 
@@ -88,13 +108,11 @@ class DockerEndpoint < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def generate_log
-    obj = {
+    @response = {
       'Docker logs' => @process_status,
       'API logs' => @result_api,
       'SE logs' => @result_ui
     }
-    response.body = JSON.generate obj
-    response['Content-Type'] = 'application/json'
   end
 
   def slack_post

data/lib/continuous_integration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContinuousIntegration
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continuous_integration
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ragavendra Nagraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest