cicd-builder 0.9.57 → 0.9.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd62a29105d756c322af200c6db09a82e48d21f
-  data.tar.gz: 3991bcdb072641afc910612c6693e7b7185ccc97
+  metadata.gz: 522beabff1900c244ed53801399e11be374bafcc
+  data.tar.gz: 146221813e4293e4b728d3811f08dd1714313b81
 SHA512:
-  metadata.gz: 4c6c6a0842aa204d488c99da2b65e77838331d30360c3c6afff34d81f285253f622c79945fe854e834643aa49869e91e075316e9ae8f538d32fa6d9a9130bad6
-  data.tar.gz: 88452616373f9c9fd1ef51a339a7f7670957a4d894cd1a530b1b0ffd946e5ae5ff324aa1a3538b809be225457f2c72e504866f875a8d04681308224b51800559
+  metadata.gz: 172c4e3d2b22f88241e0571e9058771cfe1fa76c9de9fa35efacb86a22afe7318c4232c4d17dbfc4072191a61ed47063a9863f65db30832c6c7acb31b0b0a130
+  data.tar.gz: 9dc95e9d79a69d67695e2aa958c6accdc6321487352a1babbc1f64f2e3c062f28550d9cd87241c9141b5bdeaa02987fa4bd7ad8c4f6c4f3d06c1307516011459

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.57)
+    cicd-builder (0.9.58)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

data/lib/cicd/builder/mixlib/build.rb

@@ -222,6 +222,12 @@ module CiCd
 			ret
 		end
 
+    # ---------------------------------------------------------------------------------------------------------------
+		def cleanupAfterUpload()
+      @logger.info CLASS+'::'+__method__.to_s
+			@logger.debug = %(Prior to VERSION 0.9.58 there was no #{__method__.to_s} action)
+		end
+
     # ---------------------------------------------------------------------------------------------------------------
     def createMetaData()
       @logger.info CLASS+'::'+__method__.to_s

data/lib/cicd/builder/mixlib/environment.rb

@@ -65,8 +65,10 @@ module CiCd
 				@vars[:build_store] = "#{ENV['BUILD_STORE']}"
 			end
 
-			if ENV.has_key?('BRANCH')
-				@vars[:branch] = "#{ENV['BRANCH'].gsub(%r'\/','.')}"
+			if ENV.has_key?('GIT_BRANCH')
+				@vars[:branch] = "#{ENV['GIT_BRANCH'].gsub(%r'^(refs/[^/]?|origin)/','').gsub(%r'\/','.')}"
+      elsif ENV.has_key?('BRANCH')
+        @vars[:branch] = "#{ENV['BRANCH'].gsub(%r'\/','.')}"
       end
 
 			if ENV.has_key?('VARIANT')
@@ -80,7 +82,7 @@ module CiCd
       if ENV.has_key?('ACTIONS')
         @vars[:actions] = ENV['ACTIONS'].split(%r'[, \t]+')
       else
-        @vars[:actions] = %w(prepareBuild makeBuild saveBuild uploadBuildArtifacts)
+        @vars[:actions] = %w(prepareBuild makeBuild saveBuild uploadBuildArtifacts cleanupAfterUpload)
       end
 
       if ENV.has_key?('TREE')

data/lib/cicd/builder/mixlib/errors.rb

@@ -59,6 +59,8 @@ module CiCd
       REPO_BAD_BRANCH             = i+=1
       REPO_NO_BUILD               = i+=1
 
+      NO_ACCOUNTS                 = i+=1
+
       PRUNE_TOO_OLD               = REPO_TOO_OLD
 
       require 'awesome_print'

data/lib/cicd/builder/mixlib/repo.rb

@@ -147,7 +147,7 @@ module CiCd
 					manifest[:env][k.to_s] = v
 				end
 			}
-      JSON.pretty_generate( manifest, { indent: "\t", space: ' '})
+      JSON.pretty_generate( manifest.to_hash, { indent: "\t", space: ' '})
 		end
 
     # ---------------------------------------------------------------------------------------------------------------

data/lib/cicd/builder/mixlib/repo/artifactory.rb

@@ -168,6 +168,7 @@ module CiCd
           }
           @vars[:return_code]
         end
+        alias_method :cicd_uploadToRepo, :uploadToRepo
 
         def get_artifact_file_name_ext(data)
           file_name = File.basename(data[:file])
@@ -193,16 +194,17 @@ module CiCd
           artifact_version = args[:artifact_version]
           file_ext         = args[:file_ext]
           file_name        = args[:file_name]
+          make_copy        = (args[:copy].nil? or args[:copy])
 
           artifact_name = getArtifactName(data[:name], file_name, artifact_version, file_ext) # artifact_path = "#{artifactory_org_path()}/#{data[:name]}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
           artifact_path = getArtifactPath(artifact_module, artifact_version, artifact_name)
-          objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+          objects = maybeArtifactoryObject(artifact_module, artifact_version, false, args[:repo])
           upload = false
           matched = []
           if objects.nil? or objects.size == 0
             upload = true
           else
-            @logger.info "#{artifactory_endpoint()}/#{artifactory_repo()}/#{artifact_path} exists - #{objects.size} results"
+            @logger.info "#{artifactory_endpoint()}/#{args[:repo] || artifactory_repo()}/#{artifact_path} exists - #{objects.size} results"
             @logger.info "\t#{objects.map{|o| o.attributes[:uri]}.join("\n\t")}"
             matched = matchArtifactoryObjects(artifact_path, data, objects)
             upload ||= (matched.size == 0)
@@ -213,7 +215,7 @@ module CiCd
               properties_matrix["product.#{k}"] = v
             end
             data[:properties] = properties_matrix.merge(@properties_matrix)
-            objects = uploadArtifact(artifact_module, artifact_version, artifact_path, data)
+            objects = uploadArtifact(artifact_module, artifact_version, artifact_path, data, args[:repo])
             matched = matchArtifactoryObjects(artifact_path, data, objects)
           else
             @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
@@ -228,16 +230,16 @@ module CiCd
             end
           end
           @vars[:return_code] = Errors::ARTIFACT_NOT_UPLOADED unless matched.size > 0
-          if @vars[:return_code] == 0
+          if @vars[:return_code] == 0 and make_copy
             artifact_version += "-#{data[:build] || @vars[:build_num]}"
             artifact_name = getArtifactName(data[:name], file_name, artifact_version, file_ext, )
             artifact_path = getArtifactPath(artifact_module, artifact_version, artifact_name)
-            copies  = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            copies  = maybeArtifactoryObject(artifact_module, artifact_version, false, args[:repo])
             matched = matchArtifactoryObjects(artifact_path, data, copies)
             upload  = (matched.size == 0)
             if upload
               objects.each do |artifact|
-                copied = copyArtifact(artifact_module, artifact_version, artifact_path, artifact)
+                copied = copyArtifact(artifact_module, artifact_version, artifact_path, artifact, args[:repo])
                 unless copied.size > 0
                   @vars[:return_code] = Errors::ARTIFACT_NOT_COPIED
                   break
@@ -255,6 +257,7 @@ module CiCd
 
           @vars[:return_code]
         end
+        alias_method :cicd_maybeUploadArtifactoryObject, :maybeUploadArtifactoryObject
 
         def matchArtifactoryObjects(artifact_path, data, objects)
           # matched = false
@@ -277,30 +280,13 @@ module CiCd
         end
 
         # ---------------------------------------------------------------------------------------------------------------
-        def maybeArtifactoryObject(artifact_name,artifact_version,wide=true)
+        def maybeArtifactoryObject(artifact_name,artifact_version,wide=true,repo=nil)
           begin
             # Get a list of matching artifacts in this repository
-            @logger.info "Artifactory gavc_search g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{artifactory_repo()}"
+            @logger.info "Artifactory gavc_search g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{repo || artifactory_repo()}"
             @arti_search_result     = []
-            # results = ::Parallel.map([:search,:progress], preserve_results: true, in_threads: 2) { |task|
-            #   if task == :search
-            #     @logger.debug 'searching ... '
-            #     @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
-            #     @logger.debug 'searching complete!'
-            #     raise ::Parallel::Kill
-            #     # raise ::Parallel::Break # -> stops after all current items are finished
-            #   else
-            #     progressbar = ::ProgressBar.create(:title => 'artifact_gavc_search', progress_mark: '=', length: 30, remainder_mark: '.')
-            #     30.times { |i|
-            #       @logger.debug i
-            #       sleep 1
-            #       progressbar.increment
-            #     }
-            #     raise ::Parallel::Kill
-            #   end
-            # }
             monitor(30, 'artifact_gavc_search'){
-              @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
+              @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [repo || artifactory_repo()])
             }
             # noinspection RubyScope
             if @arti_search_result.size > 0
@@ -317,6 +303,26 @@ module CiCd
           end
         end
 
+        # ---------------------------------------------------------------------------------------------------------------
+        def latestArtifactoryVersion(artifact_name, repo=nil)
+          begin
+            # Get a list of matching artifacts in this repository
+            @logger.info "Artifactory latest_version g=#{artifactory_org_path()},a=#{artifact_name},r=#{repo || artifactory_repo()}"
+            @arti_search_result     = []
+            monitor(30, 'artifact_latest_version'){
+              @arti_search_result = ::Artifactory::Resource::Artifact.latest_version(client: @client, group: artifactory_org_path(), name: artifact_name, repos: [repo || artifactory_repo()])
+            }
+            # noinspection RubyScope
+            if @arti_search_result.size > 0
+              @logger.info "\tresult: #{@arti_search_result}"
+            end
+            @arti_search_result
+          rescue Exception => e
+            @logger.error "Artifactory error: #{e.class.name} #{e.message}"
+            raise e
+          end
+        end
+
         def monitor(limit,title='Progress')
           raise 'Must have a block' unless block_given?
           thread = Thread.new(){
@@ -337,7 +343,7 @@ module CiCd
           thread.kill if thread.alive? or thread.stop?
         end
 
-        def uploadArtifact(artifact_module, artifact_version, artifact_path, data)
+        def uploadArtifact(artifact_module, artifact_version, artifact_path, data, repo=nil)
           data[:size] = File.size(data[:file])
           artifact = ::Artifactory::Resource::Artifact.new(local_path: data[:file], client: @client)
           # noinspection RubyStringKeysInHashInspection
@@ -348,14 +354,14 @@ module CiCd
           artifact.size = data[:size]
           @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start upload #{artifact_path} = #{data[:size]} bytes"
           monitor(30, 'upload') {
-            @arti_upload_result = artifact.upload(artifactory_repo(), "#{artifact_path}", data[:properties] || {})
+            @arti_upload_result = artifact.upload(repo || artifactory_repo(), "#{artifact_path}", data[:properties] || {})
           }
           @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Uploaded: #{@arti_upload_result.attributes.select { |k, _| k != :client }.ai}"
           3.times{
             @arti_upload_checksum = false
             monitor(30, 'upload_checksum') {
               begin
-                artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
+                artifact.upload_checksum(repo || artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
                 @arti_upload_checksum = true
               rescue Exception => e
                 @logger.fatal "Failed to upload #{artifact_path}: #{e.class.name} #{e.message}"
@@ -369,7 +375,7 @@ module CiCd
             @arti_upload_checksum = false
             monitor(30, 'upload_checksum') {
               begin
-                artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
+                artifact.upload_checksum(repo || artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
                 @arti_upload_checksum = true
               rescue Exception => e
                 @logger.fatal "Failed to upload #{artifact_path}: #{e.class.name} #{e.message}"
@@ -382,7 +388,7 @@ module CiCd
           attempt = 0
           objects = []
           while attempt < 3
-            objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            objects = maybeArtifactoryObject(artifact_module, artifact_version, false, repo)
             break if objects.size > 0
             sleep 2
             attempt += 1
@@ -391,9 +397,9 @@ module CiCd
           objects
         end
 
-        def copyArtifact(artifact_module, artifact_version, artifact_path, artifact)
+        def copyArtifact(artifact_module, artifact_version, artifact_path, artifact, repo=nil)
           begin
-            if artifact.attributes[:uri].eql?(File.join(artifactory_endpoint, artifactory_repo, artifact_path))
+            if artifact.attributes[:uri].eql?(File.join(artifactory_endpoint, repo || artifactory_repo, artifact_path))
               @logger.info "Not copying (identical artifact): #{artifact_path}"
             else
               @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start copy #{artifact_path} = #{artifact.attributes[:size]} bytes"
@@ -401,7 +407,7 @@ module CiCd
               3.times{
                 copied = false
                 monitor(30){
-                  result = artifact.copy("#{artifactory_repo()}/#{artifact_path}")
+                  result = artifact.copy("#{repo || artifactory_repo()}/#{artifact_path}")
                   @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Copied: #{result.ai}"
                   copied = true
                 }
@@ -409,10 +415,10 @@ module CiCd
               }
               raise "Failed to copy #{artifact_path}" unless copied
             end
-            objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            objects = maybeArtifactoryObject(artifact_module, artifact_version, false, repo)
             unless objects.size > 0
               sleep 10
-              objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+              objects = maybeArtifactoryObject(artifact_module, artifact_version, false, repo)
               raise "Failed to copy '#{artifact_path}'" unless objects.size > 0
             end
             objects
@@ -452,7 +458,7 @@ module CiCd
               # end
               @vars[:return_code]
             rescue => e
-              @logger.error "#{e.class.name} #{e.message}"
+              @logger.error "#{e.class.name} #{e.message}\n#{e.backtrace.ai}"
               @vars[:return_code] = Errors::ARTIFACT_UPLOAD_EXCEPTION
               raise e
             end

data/lib/cicd/builder/version.rb

@@ -4,7 +4,7 @@ module CiCd
 		# file    = File.expand_path("#{File.dirname(__FILE__)}/../../../VERSION")
 		# lines   = File.readlines(file)
 		# version = lines[0]
-		version = '0.9.57'
+		version = '0.9.58'
 		VERSION = version unless const_defined?('VERSION')
 		major, minor, tiny = VERSION.split('.')
 		MAJOR   = major unless const_defined?('MAJOR')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cicd-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.57
+  version: 0.9.58
 platform: ruby
 authors:
 - Christo De Lange