Skip to content

Commit

Permalink
Release (#120)
Browse files Browse the repository at this point in the history
* Update teardown and rebuild stage (#115)

Now determines which UUID to pass to the picsureui_settings.json file based on the global param is_open_access.

* [ALS-6225] Add new variables to Teardown and Rebuild stage (#117)

Enhanced the TearDown and Rebuild stage environment configuration by adding two new variables, "app_acct_id" and "app_user_secret_name". These additional variables will provide greater flexibility during the teardown and rebuild stage operations.

* Add run bash functions (#118)

* [ALS - 6004] - Needs to be Groovy System Script (#119)

* Add run bash functions

* Needs to be Groovy SYSTEM Script

---------

Co-authored-by: Gcolon021 <34667267+Gcolon021@users.noreply.github.com>
  • Loading branch information
TDeSain and Gcolon021 authored May 9, 2024
1 parent 051584d commit 38884aa
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 6 deletions.
28 changes: 25 additions & 3 deletions jenkins-docker/jobs/Import HPDS VCF Data/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<description></description>
<keepDependencies>false</keepDependencies>
<properties/>
<scm class="hudson.plugins.git.GitSCM" plugin="git@5.2.0">
<scm class="hudson.plugins.git.GitSCM" plugin="git@5.2.1">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
Expand All @@ -24,9 +24,23 @@
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>(System)</jdk>
<triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.plugins.groovy.SystemGroovy plugin="groovy@457.v99900cb_85593">
<source class="hudson.plugins.groovy.StringSystemScriptSource">
<script plugin="script-security@1336.vf33a_a_9863911">
<script>import jenkins.*
import jenkins.model.*
import hudson.*
import hudson.model.*

def bashFunctionsJob = Jenkins.instance.getItemByFullName(&quot;Bash_Functions&quot;).scheduleBuild2(0).get()</script>
<sandbox>false</sandbox>
</script>
</source>
</hudson.plugins.groovy.SystemGroovy>
<hudson.tasks.Shell>
<command>#!/bin/bash
set -e
Expand All @@ -44,7 +58,8 @@ for script_file in &quot;$source_scripts_folder&quot;*.sh; do
done
SOURCE_FILE_S3_LINK=`grep source_genomic_dataset_s3_url build-spec.json | cut -d &apos;:&apos; -f 2,3 | sed &apos;s/&quot;//g&apos;`

[ -d &apos;all&apos; ] || mkdir all/
rm -rf all/
mkdir all/
assume_role &quot;arn:aws:iam::736265540791:role/curated-datasets-s3-role&quot;
aws s3 cp --recursive $SOURCE_FILE_S3_LINK all/

Expand All @@ -55,5 +70,12 @@ aws s3 --sse=AES256 cp --recursive all/ s3://${stack_s3_bucket}/data/`git blame
</hudson.tasks.Shell>
</builders>
<publishers/>
<buildWrappers/>
<buildWrappers>
<hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.45">
<deleteDirs>false</deleteDirs>
<cleanupParameter></cleanupParameter>
<externalDelete></externalDelete>
<disableDeferredWipeout>false</disableDeferredWipeout>
</hudson.plugins.ws__cleanup.PreBuildCleanup>
</buildWrappers>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ if $isDestroyOnly; then
-var=&quot;picsure_db_host=${picsure_db_host}&quot; \
-var=&quot;picsure_db_password=${picsure_db_password}&quot; \
-var=&quot;picsure_db_username=${picsure_db_username}&quot; \
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; || true
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; \
-var=&quot;app_acct_id=${app_acct_id}&quot; \
-var=&quot;app_user_secret_name=${database_app_user_secret_name}&quot; || true


reset_role

Expand Down Expand Up @@ -277,7 +280,10 @@ else
-var=&quot;picsure_db_host=${picsure_db_host}&quot; \
-var=&quot;picsure_db_password=${picsure_db_password}&quot; \
-var=&quot;picsure_db_username=${picsure_db_username}&quot; \
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; || true
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; \
-var=&quot;app_acct_id=${app_acct_id}&quot; \
-var=&quot;app_user_secret_name=${database_app_user_secret_name}&quot; || true


terraform apply -auto-approve \
-var=&quot;dataset_s3_object_key=${dataset_s3_object_key}&quot; \
Expand Down Expand Up @@ -320,7 +326,10 @@ else
-var=&quot;picsure_db_host=${picsure_db_host}&quot; \
-var=&quot;picsure_db_password=${picsure_db_password}&quot; \
-var=&quot;picsure_db_username=${picsure_db_username}&quot; \
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; || true
-var=&quot;pic_sure_resource_id=${picsure_resource_uuid}&quot; \
-var=&quot;app_acct_id=${app_acct_id}&quot; \
-var=&quot;app_user_secret_name=${database_app_user_secret_name}&quot; || true


reset_role

Expand Down

0 comments on commit 38884aa

Please sign in to comment.