lib/cicd/builder/mixlib/repo/artifactory.rb in cicd-builder-0.9.30 vs lib/cicd/builder/mixlib/repo/artifactory.rb in cicd-builder-0.9.31

@@ -104,11 +104,11 @@
               raise "Unable to parse out file name in #{data[:file]}"
             end
             unless file_name.empty? or file_name.match(%r'^-')
               file_name = "-#{file_name}"
             end
-            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{data[:build]}.#{file_ext}" # -#{@vars[:variant]}
+            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{@vars[:variant]}.#{file_ext}" # -#{data[:build]}
             artifact_path = "#{artifactory_org_path()}/#{data[:name]}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
             manifest[data[:name]] = artifact_path
             if objects.nil? or objects.size == 0
               upload = true
             else
@@ -144,10 +144,10 @@
           end
           data = { data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix }
           tempArtifactFile('manifest', data)
           sha1 = Digest::SHA1.file(data[:file]).hexdigest
           md5  = Digest::MD5.file(data[:file]).hexdigest
-          artifact_name = "#{artifactory_manifest_name}-#{data[:version]}-#{data[:build]}.properties"
+          artifact_name = "#{artifactory_manifest_name}-#{data[:version]}-#{data[:variant]}.properties"
           artifact_path = "#{artifactory_org_path()}/#{artifactory_manifest_module}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
           uploadArtifact(artifact_path, data, md5, sha1)
           if data[:temp]
             File.unlink(data[:file])
           end
\ No newline at end of file