@docupace/pipeline 1.0.7-beta.0 → 1.0.7-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.7-beta.0",
+  "version": "1.0.7-beta.2",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/cli.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 // GIT SHA computation
 import { $ } from 'zx';
-import { deployCore } from './jenkins.js';
+import {deployConnect, deployCore} from './jenkins.js';
 import { runPipeline } from './pipline.js';
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
@@ -69,6 +69,15 @@ program
     await deployCore(env, site, options.liquibase, options.branch);
   });
 
+program
+  .command('deploy-connect <env> <site>')
+  .description('Deploy Core')
+  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
+  .option('-b, --branch <branch>', 'Branch', 'master')
+  .action(async (env, site, options) => {
+    await deployConnect(env, site, options.liquibase, options.branch);
+  });
+
 program
   .command('deploy-core-pipeline <env> <site>')
   .description('Deploy Core')

package/src/next/config.js

@@ -2,24 +2,24 @@ export const environments = ['dev', 'qa', 'uat', 'stage', 'prod'];
 
 export const environmentConfig = {
   dev: {
-    newUrl: (site) => `${site}.dev.dpai.tech`,
+    newUrl: (site) => `https://${site}.dev.dpai.tech`,
     oldUrl: (site) => `https://www.dev.docupaceinc.com/${site}`,
   },
   qa: {
-    newUrl: (site) => `${site}.qa.dpai.tech`,
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
     oldUrl: (site) => `https://www.preprod.docupaceinc.com/${site}`,
   },
   uat: {
-    newUrl: (site) => `${site}.qa.dpai.tech`,
+    newUrl: (site) => `https://${site}.qa.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
   },
   stage: {
-    newUrl: (site) => `${site}.stage.dpai.tech`,
+    newUrl: (site) => `https://${site}.stage.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
   },
 
   prod: {
-    newUrl: (site) => `${site}.dpai.tech`,
+    newUrl: (site) => `https://${site}.dpai.tech`,
     oldUrl: (site) => `https://www2.paperout.com/${site}`,
   },
 };

package/src/next/deploy.js

@@ -245,7 +245,9 @@ export async function deployFromSite(
 ) {
   if (isDeployCore === 'true') {
     const branchName = await getCoreBranchName(fromEnv, fromSite);
-    await deployCore(toEnv, toSite, 'true', branchName);
+
+    const coreEnv = toEnv == 'qa' ? 'preprod' : toEnv;
+    await deployCore(coreEnv, toSite, 'true', branchName);
 
     // To be added back when splitting between on prem and in cloud
     /*await runPipeline('site-deploy', 'deploy-core', 'main', {

package/src/next/jenkins.js

@@ -1,9 +1,14 @@
 import axios from 'axios';
 
-const JENKINS_URL = 'http://devops.corp.docupace.com';
-const JOB_NAME = 'auto-deploy-site';
-const USERNAME = process.env.CORE_JENKINS_USERNAME;
-const API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
+const CORE_JENKINS_URL = 'http://devops.corp.docupace.com';
+const CORE_JOB_NAME = 'auto-deploy-site';
+const CORE_USERNAME = process.env.CORE_JENKINS_USERNAME;
+const CORE_API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
+
+const CONNECT_JENKINS_URL = 'http://usdoc-s-buildui.corp.docupace.com/jenkins';
+const CONNECT_JOB_NAME = 'docupace_build_and_run_site_v2';
+const CONNECT_USERNAME = process.env.CONNECT_JENKINS_USERNAME;
+const CONNECT_API_TOKEN = process.env.CONNECT_JENKINS_API_TOKEN;
 
 export async function deployCore(env, site, liquibase, gitBranch) {
   const parameters = {
@@ -13,14 +18,43 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     gitBranch,
   };
 
+  return callJenkinsJob({
+    jenkinsUrl: CORE_JENKINS_URL,
+    jobName: CORE_JOB_NAME,
+    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
+    parameters,
+  });
+}
+
+export async function deployConnect(env, site, liquibase, branch) {
+  const parameters = {
+    BUILD_ENVIRONMENT: env,
+    BUILD_SITE: site,
+    RUN_LIQUIBASE: liquibase,
+  };
+
+  return callJenkinsJob({
+    jenkinsUrl: CONNECT_JENKINS_URL,
+    jobName: CONNECT_JOB_NAME,
+    auth: { username: CONNECT_USERNAME, password: CONNECT_API_TOKEN },
+    parameters,
+  });
+}
+
+export async function callJenkinsJob({
+  jenkinsUrl,
+  jobName,
+  auth,
+  parameters,
+}) {
   try {
     // Trigger the job
     console.log('Triggering Jenkins job...');
     const buildResponse = await axios.post(
-      `${JENKINS_URL}/job/${JOB_NAME}/buildWithParameters`,
+      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
       new URLSearchParams(parameters),
       {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
       },
@@ -33,7 +67,7 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     let jobUrl = null;
     while (!jobUrl) {
       const queueResponse = await axios.get(`${queueUrl}api/json`, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
       });
       jobUrl = queueResponse.data.executable?.url || null;
 
@@ -54,7 +88,7 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     console.log('Streaming job output...');
     while (true) {
       const consoleResponse = await axios.get(consoleUrl, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
         responseType: 'text',
       });
 
@@ -65,16 +99,16 @@ export async function deployCore(env, site, liquibase, gitBranch) {
 
       // Check job status
       const jobResponse = await axios.get(`${jobUrl}api/json`, {
-        auth: { username: USERNAME, password: API_TOKEN },
+        auth,
       });
       const result = jobResponse.data.result;
 
       if (result) {
         console.log(`\nJob completed with result: ${result}`);
         if (result === 'SUCCESS') {
-          process.exit(0);
+          return;
         } else {
-          process.exit(1);
+          throw new Error('Jenkins job failed');
         }
       }
 
@@ -83,6 +117,6 @@ export async function deployCore(env, site, liquibase, gitBranch) {
     }
   } catch (error) {
     console.error('Error:', error.message);
-    process.exit(1);
+    throw error;
   }
 }