@docupace/pipeline 1.0.6-alpha.0 → 1.0.6-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.6-alpha.0",
+  "version": "1.0.6-alpha.10",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -35,6 +35,7 @@
   },
   "scripts": {
     "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",
-    "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true"
+    "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true",
+    "test-run-pipline": "dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa"
   }
 }

package/src/next/cli.js

@@ -16,7 +16,7 @@ const program = new Command();
 // GIT SHA computation
 import { $ } from 'zx';
 import { deployCore } from './jenkins.js';
-import {runPipeline, triggerPipelineByName} from './pipline.js';
+import { runPipeline } from './pipline.js';
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
 program
@@ -96,7 +96,7 @@ program
   });
 
 program
-  .command('trigger-pipeline')
+  .command('run-pipeline')
   .description('Trigger a pipeline by name')
   .requiredOption('-r, --repository <repository>', 'Repository name')
   .requiredOption('-p, --pipeline-name <pipelineName>', 'Pipeline name')
@@ -112,13 +112,14 @@ program
       return { ...previous, [key]: val };
     },
     {},
-  ) // Initialize as an empty object
+  )
+  .option('-w, --wait', 'Wait for the pipeline to complete', false) // Defaults to false
   .action(async (cmdObj) => {
     try {
-      const { repository, pipelineName, branch, variables } = cmdObj;
+      const { repository, pipelineName, branch, variables, wait } = cmdObj;
 
       // Call the triggerPipelineByName function
-      await triggerPipelineByName(repository, pipelineName, branch, variables);
+      await runPipeline(repository, pipelineName, branch, variables, wait);
     } catch (error) {
       console.error('Error triggering pipeline:', error.message);
       process.exit(1);

package/src/next/pipline.js

@@ -3,7 +3,9 @@ import { getBitbucketInfo } from './config.js';
 
 const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
 
-export async function triggerPipelineByName(
+const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
+
+async function triggerPipelineByName(
   repository,
   pipelineName,
   branch,
@@ -26,11 +28,13 @@ export async function triggerPipelineByName(
         pattern: pipelineName,
       },
     },
-    variables: Object.entries(variables).map(([key, value]) => ({
-      key,
-      value,
-      secured: false, // Set to true if the variable should be secure
-    })),
+    variables: variables
+      ? Object.entries(variables).map(([key, value]) => ({
+          key,
+          value,
+          secured: false, // Set to true if the variable should be secure
+        }))
+      : undefined,
   };
 
   try {
@@ -65,7 +69,13 @@ async function getPipelineStatus(repository, pipelineUUID) {
   }
 }
 
-export async function runPipeline(repository, pipelineName, branch, variables) {
+export async function runPipeline(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+  wait = false,
+) {
   try {
     console.log(
       `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
@@ -76,9 +86,20 @@ export async function runPipeline(repository, pipelineName, branch, variables) {
       branch,
       variables,
     );
+
     const pipelineUUID = pipeline.uuid;
+    const buildNumber = pipeline.build_number;
 
     console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
+    console.log(
+      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
+    );
+
+    if (!wait) {
+      return;
+    }
+
+
     let status = '';
     do {
       console.log('Checking pipeline status...');