Removed unnessasary publish artifacts

siemens · Feb 6, 2025 · 90d2aa8 · 90d2aa8
1 parent 23137e4
commit 90d2aa8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs
@@ -997,8 +997,7 @@ public static async Task UploadingThePackages(List<ComponentsToArtifactory> comp
             }
 
             if (SetWarningCode)
-            {
-                PipelineArtifactUploader.UploadArtifacts();
+            {                
                 Environment.ExitCode = 2;
                 Logger.Debug("Setting ExitCode to 2");
             }

diff --git a/src/LCT.Common.UTests/PipelineArtifactUploaderTest.cs b/src/LCT.Common.UTests/PipelineArtifactUploaderTest.cs
@@ -60,11 +60,11 @@ public void UploadLogs_ShouldNotUpload_WhenInUnknownEnvironment()
             Environment.SetEnvironmentVariable("Build_BuildId", null); // No pipeline detected
 
             // Act
-            PipelineArtifactUploader.UploadLogs();
-            string output = consoleOutput.ToString();
+            PipelineArtifactUploader.UploadBom();
+            string output = consoleOutput.ToString().Trim();
 
             // Assert
-            Assert.That(output, Is.Empty);
+            Assert.AreEqual("Uploading of SBOM is not supported.", output);
         }
 
         [Test]

diff --git a/src/LCT.Common/CommonHelper.cs b/src/LCT.Common/CommonHelper.cs
@@ -156,8 +156,7 @@ public static void WriteComponentsWithoutDownloadURLToKpi(List<ComparisonBomData
             const string URL = "SW360 Release URL";
             if (componentInfo.Count > 0 || lstReleaseNotCreated.Count > 0)
             {
-                Logger.Logger.Log(null, Level.Alert, "Action Item required by the user:\n", null);
-                PipelineArtifactUploader.UploadArtifacts();
+                Logger.Logger.Log(null, Level.Alert, "Action Item required by the user:\n", null);                
                 Environment.ExitCode = 2;
             }
 
@@ -203,8 +202,7 @@ public static void WriteComponentsNotLinkedListInConsole(List<Components> compon
             const string Version = "Version";
 
             if (components.Count > 0)
-            {
-                PipelineArtifactUploader.UploadArtifacts();
+            {               
                 Environment.ExitCode = 2;
                 Logger.Logger.Log(null, Level.Alert, "* Components Not linked to project :", null);
                 Logger.Logger.Log(null, Level.Alert, " Can be linked manually OR Check the Logs AND RE-Run", null);

diff --git a/src/LCT.Common/PipelineArtifactUploader.cs b/src/LCT.Common/PipelineArtifactUploader.cs
@@ -26,10 +26,10 @@ public static void UploadArtifacts()
         /// </summary>
         public static void UploadLogs()
         {
-            EnvironmentType envType = RuntimeEnvironment.GetEnvironment();
-            LogManager.Shutdown();
+            EnvironmentType envType = RuntimeEnvironment.GetEnvironment();           
             if (envType == EnvironmentType.AzurePipeline && !string.IsNullOrEmpty(Log4Net.CatoolLogPath) && File.Exists(Log4Net.CatoolLogPath))
-            {                
+            {
+                LogManager.Shutdown();
                 Console.WriteLine($"##vso[artifact.upload containerfolder={LogContainerFolderName};artifactname={LogArtifactFolderName}]{Log4Net.CatoolLogPath}");
             }
             else if (envType == EnvironmentType.Unknown)