Merge pull request #654 from uc-cdis/fix/data_upload_bucket_url

fix bucketname logic
uc-cdis · Jul 16, 2021 · cbd5552 · cbd5552
2 parents 4b71faa + 64b4916
commit cbd5552
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/suites/portal/dataUploadTest.js b/suites/portal/dataUploadTest.js
@@ -44,9 +44,10 @@ const uploadFile = async function (I, dataUpload, indexd, sheepdog, nodes, fileO
   // additional scrutiny for file upload only when running inside Jenkins
   if (inJenkins) {
     const maxAttempts = 6;
-    const jenkinsNamespace = process.env.HOSTNAME.replace('.planx-pla.net', '');
-    const bucketName = `${jenkinsNamespace}-databucket-gen3`;
-
+    // const jenkinsNamespace = process.env.HOSTNAME.replace('.planx-pla.net', '');
+    // const bucketName = `${jenkinsNamespace}-databucket-gen3`;
+    const bucketName = bash.runCommand('gen3 secrets decode fence-config fence-config.yaml | yq -r .DATA_UPLOAD_BUCKET');
+    console.log(bucketName);
     for (let i = 1; i <= maxAttempts; i += 1) {
       try {
         console.log(`waiting for file [${fileName}] with guid [${fileGuid}] to show up on ${bucketName}... - attempt ${i}`);