DEVOP-32: concatenate timeout last attemp second try

peachjar · May 17, 2024 · ae668c0 · ae668c0
1 parent 8212d3f
commit ae668c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -24310,7 +24310,7 @@ function run(exec, context, core, env) {
             const repository = context.repo.repo;
             const serviceName = getServiceName(repository);
             const gitsha = context.sha.slice(0, 7);
-            const timeout = core.getInput('timeout') || '600' + 's';
+            const timeout = core.getInput('timeout') || '600';
             const pullSecret = core.getInput('imagePullSecret') || 'peachjar-eks-github-pull-secret';
             const helmChartPath = core.getInput('helmChartPath') || `./${serviceName}`;
             const helmReleaseName = core.getInput('helmReleaseName') || serviceName;
@@ -24348,7 +24348,6 @@ function run(exec, context, core, env) {
             });
             core.info('Migration to helm3 succeeded');
             core.info('Starting deploy...');
-            core.info(timeout);
             yield exec('helm', [
                 '--kubeconfig',
                 `../kilauea/kubefiles/${environment}/kubectl_configs/${environment}-kube-config-beta-admins.yml`,
@@ -24358,7 +24357,7 @@ function run(exec, context, core, env) {
                 '--set-string', `image.registryAndName=${dockerImage}`,
                 '--set-string', `image.pullSecret=${pullSecret}`,
                 ...extraVars,
-                '--wait', '--timeout', `${timeout}`
+                '--wait', '--timeout', `${timeout}s`
             ], {
                 cwd: 'peachjar-aloha/',
                 env: Object.assign({}, env, {

diff --git a/src/run.ts b/src/run.ts
@@ -46,7 +46,7 @@ export default async function run(
         const serviceName = getServiceName(repository)
         const gitsha = context.sha.slice(0, 7)
 
-        const timeout = core.getInput('timeout') || '600'+'s'
+        const timeout = core.getInput('timeout') || '600'
         const pullSecret = core.getInput('imagePullSecret') || 'peachjar-eks-github-pull-secret'
         const helmChartPath = core.getInput('helmChartPath') || `./${serviceName}`
         const helmReleaseName = core.getInput('helmReleaseName') || serviceName
@@ -93,7 +93,6 @@ export default async function run(
 
         core.info('Migration to helm3 succeeded')
         core.info('Starting deploy...')
-        core.info(timeout)
 
         await exec('helm', [
             '--kubeconfig',
@@ -104,7 +103,7 @@ export default async function run(
             '--set-string', `image.registryAndName=${dockerImage}`,
             '--set-string', `image.pullSecret=${pullSecret}`,
             ...extraVars,
-            '--wait', '--timeout', `${timeout}`
+            '--wait', '--timeout', `${timeout}s`
         ], {
             cwd: 'peachjar-aloha/',
             env: Object.assign({}, env, {