@docupace/pipeline 1.0.26 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/deploy.js

@@ -27,10 +27,11 @@ async function updateAndCommitConnectVersion(
   getComparedVersion,
   connectDeployPath,
 ) {
+  const connectToEnv = toEnv == 'qa' ? 'preprod' : toEnv;
   const filePath = path.join(
     connectDeployPath,
     'envs',
-    toEnv,
+    connectToEnv,
     toSite,
     'dock.sh',
   );

package/src/next/jenkins.js

@@ -1,123 +1,123 @@
-import axios from 'axios';
-
-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 = {
-    environment: env,
-    site: site.toUpperCase(),
-    runLiquibase: liquibase,
-    gitBranch,
-  };
-
-  return callJenkinsJob({
-    jenkinsUrl: CORE_JENKINS_URL,
-    jobName: CORE_JOB_NAME,
-    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
-    parameters,
-  });
-}
-
-// eslint-disable-next-line no-unused-vars
-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(
-      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
-      new URLSearchParams(parameters),
-      {
-        auth,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
-      },
-    );
-
-    const queueUrl = buildResponse.headers.location;
-    console.log(`Job queued at: ${queueUrl}`);
-
-    // Poll queue for executable URL
-    let jobUrl = null;
-    while (!jobUrl) {
-      const queueResponse = await axios.get(`${queueUrl}api/json`, {
-        auth,
-      });
-      jobUrl = queueResponse.data.executable?.url || null;
-
-      if (!jobUrl) {
-        console.log('Waiting for job to start...');
-        await new Promise((resolve) => setTimeout(resolve, 5000));
-      }
-    }
-
-    jobUrl = jobUrl.replaceAll('https', 'http');
-
-    console.log(`Job started at: ${jobUrl}`);
-
-    // Stream console output
-    const consoleUrl = `${jobUrl}consoleText`;
-    let lastSize = 0;
-
-    console.log('Streaming job output...');
-    while (true) {
-      const consoleResponse = await axios.get(consoleUrl, {
-        auth,
-        responseType: 'text',
-      });
-
-      const consoleText = consoleResponse.data;
-      const newOutput = consoleText.slice(lastSize);
-      process.stdout.write(newOutput); // Write new output to console
-      lastSize = consoleText.length;
-
-      // Check job status
-      const jobResponse = await axios.get(`${jobUrl}api/json`, {
-        auth,
-      });
-      const result = jobResponse.data.result;
-
-      if (result) {
-        console.log(`\nJob completed with result: ${result}`);
-        if (result === 'SUCCESS') {
-          return;
-        } else {
-          throw new Error('Jenkins job failed');
-        }
-      }
-
-      // Wait before polling again
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    }
-  } catch (error) {
-    console.error('Error:', error.message);
-    throw error;
-  }
-}
+import axios from 'axios';
+
+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 = {
+    environment: env,
+    site: site.toUpperCase(),
+    runLiquibase: liquibase,
+    gitBranch,
+  };
+
+  return callJenkinsJob({
+    jenkinsUrl: CORE_JENKINS_URL,
+    jobName: CORE_JOB_NAME,
+    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
+    parameters,
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+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(
+      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
+      new URLSearchParams(parameters),
+      {
+        auth,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
+      },
+    );
+
+    const queueUrl = buildResponse.headers.location;
+    console.log(`Job queued at: ${queueUrl}`);
+
+    // Poll queue for executable URL
+    let jobUrl = null;
+    while (!jobUrl) {
+      const queueResponse = await axios.get(`${queueUrl}api/json`, {
+        auth,
+      });
+      jobUrl = queueResponse.data.executable?.url || null;
+
+      if (!jobUrl) {
+        console.log('Waiting for job to start...');
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+      }
+    }
+
+    jobUrl = jobUrl.replaceAll('https', 'http');
+
+    console.log(`Job started at: ${jobUrl}`);
+
+    // Stream console output
+    const consoleUrl = `${jobUrl}consoleText`;
+    let lastSize = 0;
+
+    console.log('Streaming job output...');
+    while (true) {
+      const consoleResponse = await axios.get(consoleUrl, {
+        auth,
+        responseType: 'text',
+      });
+
+      const consoleText = consoleResponse.data;
+      const newOutput = consoleText.slice(lastSize);
+      process.stdout.write(newOutput); // Write new output to console
+      lastSize = consoleText.length;
+
+      // Check job status
+      const jobResponse = await axios.get(`${jobUrl}api/json`, {
+        auth,
+      });
+      const result = jobResponse.data.result;
+
+      if (result) {
+        console.log(`\nJob completed with result: ${result}`);
+        if (result === 'SUCCESS') {
+          return;
+        } else {
+          throw new Error('Jenkins job failed');
+        }
+      }
+
+      // Wait before polling again
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    }
+  } catch (error) {
+    console.error('Error:', error.message);
+    throw error;
+  }
+}