New options for run pipeline (cpu,memory, disk, runtime-name, pack-na… (#372)

Author: olegz-codefresh

lib/interface/cli/commands/pipeline/run.base.js

@@ -11,28 +11,26 @@ class RunBaseCommand {
         this.argv = argv;
         this.executionRequests = [];
     }
+
     async run() {
         await this.preRunRequest();
+        const { debug, skip, only, trigger, cpu, memory, branch, sha, disk } = this.argv;
         const variablesFromFile = this.argv['var-file'];
         const pipelineName = this.argv.name;
-        const { branch, sha } = this.argv;
         const noCache = this.argv['no-cache'];
+        const runtimeName = this.argv['runtime-name'];
         const enableNotifications = this.argv['enable-notifications'];
         const resetVolume = this.argv['reset-volume'];
         const userYamlDescriptor = this.argv.yaml;
         const contexts = this.argv.context;
         const noCfCache = this.argv['no-cf-cache'];
-        const trigger = this.argv['trigger'];
-        const only = this.argv['only'];
-        const skip = this.argv['skip'];
-        const debug = this.argv['debug'];
+        const packName = this.argv['pack-name'];
+
         if (process.env.CF_BUILD_ID) {
             this.argv.annotation.push(`cf_predecessor=${process.env.CF_BUILD_ID}`);
         }
-        const annotations = prepareKeyValueFromCLIEnvOption(this.argv.annotation);
-
-
 
+        const annotations = prepareKeyValueFromCLIEnvOption(this.argv.annotation);
         const executionRequestTemplate = {
             pipelineName,
             options: {
@@ -48,8 +46,14 @@ class RunBaseCommand {
                 skip,
                 annotations,
                 debug,
+                cpu,
+                memory,
+                disk,
+                runtimeName,
+                packName,
             },
         };
+
         if (variablesFromFile) {
             _.forEach(variablesFromFile, (variables) => {
                 const request = _.cloneDeep(executionRequestTemplate);
@@ -78,6 +82,7 @@ class RunBaseCommand {
     async runImpl() {
         throw new Error('To be implemented in the derived class');
     }
+
     // eslint-disable-next-line class-methods-use-this
     async preRunAll() {
         const pipelineName = this.argv.name;
@@ -109,21 +114,26 @@ class RunBaseCommand {
             });
         }
     }
+
     // eslint-disable-next-line class-methods-use-this
     get isParalel() {
         return true;
     }
+
     // eslint-disable-next-line class-methods-use-this
     async preRunRequest() {
         return Promise.resolve();
     }
+
     // eslint-disable-next-line class-methods-use-this
     async postRunRequest() {
         return Promise.resolve();
     }
+
     // eslint-disable-next-line class-methods-use-this
     async postRunAll() {
         return Promise.resolve();
     }
 }
+
 module.exports = RunBaseCommand;

lib/interface/cli/commands/pipeline/run.cf.js

@@ -5,57 +5,21 @@ const { followLogs } = require('../../helpers/logs');
 function _buildBody(data) {
     const body = {
         options: {},
+        userMachineConfig: {},
     };
 
-    if (data.branch) {
-        body.branch = data.branch;
-    }
-
-    if (data.variables) {
-        body.variables = data.variables;
-    }
-
-    if (data.noCache) {
-        body.options.noCache = data.noCache;
-    }
-
-    if (data.noCfCache) {
-        body.options.noCfCache = data.noCfCache;
-    }
-
-    if (data.enableNotifications) {
-        body.options.enableNotifications = data.enableNotifications;
-    }
-
-    if (data.resetVolume) {
-        body.options.resetVolume = data.resetVolume;
-    }
-
-    if (data.annotations) {
-        body.annotations = data.annotations;
-    }
-
-    if (data.sha) {
-        body.sha = data.sha;
-    }
+    ['branch', 'variables', 'annotations', 'sha', 'userYamlDescriptor', 'contexts', 'trigger']
+        .filter(property => data[property])
+        .forEach(property => Object.assign(body, { [property]: data[property] }));
 
-    if (data.userYamlDescriptor) {
-        body.userYamlDescriptor = data.userYamlDescriptor;
-    }
+    ['noCache', 'noCfCache', 'enableNotifications', 'resetVolume', 'skip', 'only']
+        .filter(property => data[property])
+        .forEach(property => Object.assign(body.options, { [property]: data[property] }));
 
-    if (data.contexts) {
-        body.contexts = data.contexts;
-    }
+    ['cpu', 'memory', 'disk', 'runtimeName', 'packName']
+        .filter(property => data[property])
+        .forEach(property => Object.assign(body.userMachineConfig, { [property]: data[property] }));
 
-    if (data.trigger) {
-        body.trigger = data.trigger;
-    }
-    if (data.skip) {
-        body.options.skip = data.skip;
-    }
-    if (data.only) {
-        body.options.only = data.only;
-    }
     return body;
 }
 

lib/interface/cli/commands/pipeline/run.cmd.js

@@ -34,6 +34,25 @@ const run = new Command({
             .positional('name', {
                 describe: 'Pipeline name',
             })
+            .option('memory', {
+                describe: 'Mention machine memory sizes during pipeline run',
+                coerce: value => `${value}Mi`,
+            })
+            .option('cpu', {
+                describe: 'Mention machine cpu sizes during pipeline run',
+                coerce: value => `${value}m`,
+            })
+            .option('disk', {
+                describe: 'Mention machine disk space sizes during pipeline run',
+                coerce: value => `${value}Gi`,
+            })
+            .option('pack-name', {
+                describe: 'Resources size (`small`, `medium` or `large`)',
+                choices: ['small', 'medium', 'large'],
+            })
+            .option('runtime-name', {
+                describe: 'Runtime environment for run pipeline',
+            })
             .option('sha', {
                 describe: 'Set commit sha',
                 alias: 's',
@@ -90,11 +109,11 @@ const run = new Command({
             })
             .option('only', {
                 describe: 'run only specifc steps',
-                array: true
+                array: true,
             })
             .option('skip', {
                 describe: 'skip specifc steps',
-                array: true
+                array: true,
             })
             .option('debug', {
                 describe: 'debug mode',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.37.2",
+  "version": "0.37.5",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,