Skip to content

Commit 0307de0

Browse files
authored
Redirect for artifacts (#64)
1 parent 24dfb8f commit 0307de0

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

scripts/trigger-pipeline.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111

1212
mkdir -p /tmp/swissknife/
1313

14-
cat > /tmp/swissknife/trigger_pipeline.sh \<<'EOF'
14+
cat > /tmp/swissknife/trigger_pipeline.sh <<'EOF'
1515
#!/bin/bash -x
1616
echo "----------------------------------------"
1717
echo "Triggering Pipeline"
@@ -41,6 +41,10 @@ EOF
4141

4242
chmod +x /tmp/swissknife/trigger_pipeline.sh
4343

44-
if [[ "<< parameters.install-skip-trigger >>" == "false" ]]; then
45-
/tmp/swissknife/trigger_pipeline.sh << parameters.vcs-type >> $<< parameters.user >> $<< parameters.repo-name >> $<< parameters.branch >> '<< parameters.custom-parameters >>'
44+
PARAM_USER=$(printf '%s\n' "${!PARAM_USER_ENV_VAR}")
45+
PARAM_REPO=$(printf '%s\n' "${!PARAM_REPO_ENV_VAR}")
46+
PARAM_BRANCH=$(printf '%s\n' "${!PARAM_BRANCH_ENV_VAR}")
47+
48+
if [[ "$SKIP_TRIGGER" == "false" ]]; then
49+
/tmp/swissknife/trigger_pipeline.sh "$VCS_TYPE" "$PARAM_USER" "$PARAM_REPO" "$PARAM_BRANCH" "$CUSTOM_PARAMS"
4650
fi

src/commands/get_job_artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ steps:
6969
7070
cd << parameters.save-to-directory >>
7171
if [[ "<< parameters.file-name >>" == "NA" ]]; then
72-
curl -H "Circle-Token: $CIRCLE_TOKEN" --remote-name $REQUIRED_ARTIFACT_URL
72+
curl -L -H "Circle-Token: $CIRCLE_TOKEN" --remote-name $REQUIRED_ARTIFACT_URL
7373
else
74-
curl -H "Circle-Token: $CIRCLE_TOKEN" -o << parameters.file-name >> $REQUIRED_ARTIFACT_URL
74+
curl -L -H "Circle-Token: $CIRCLE_TOKEN" -o << parameters.file-name >> $REQUIRED_ARTIFACT_URL
7575
fi
7676
echo "File downloaded to << parameters.save-to-directory >>"
7777
}

src/commands/trigger-pipeline.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,11 @@ parameters:
3131
steps:
3232
- run:
3333
name: Trigger pipeline
34+
environment:
35+
SKIP_TRIGGER: << parameters.install-skip-trigger >>
36+
VCS_TYPE: << parameters.vcs-type >>
37+
PARAM_USER_ENV_VAR: << parameters.user >>
38+
PARAM_REPO_ENV_VAR: << parameters.repo-name >>
39+
PARAM_BRANCH_ENV_VAR: << parameters.branch >>
40+
CUSTOM_PARAMS: << parameters.custom-parameters >>
3441
command: << include(../scripts/trigger-pipeline.sh) >>

0 commit comments

Comments
 (0)