diff options
| author |   Hagop Bozawglanian <hagop.bozawglanian@att.com> | 2019-02-26 21:42:22 +0000 |
|---|---|---|
| committer | Hagop Bozawglanian <hagop.bozawglanian@att.com> | 2019-02-26 21:42:22 +0000 |
| commit | fc540d4f456535bd113429092ecd30b43ee62f23 (patch) | |
| tree | 55e4c7813e84769d456421625b34243b3f198b24 /jjb/vnfrqts | |
| parent | 7c796cb048cdbe4e03dc0fbee2f521cc76dbc239 (diff) | |
VNFRQTS - Fix curl statement
Update the curl statement and changes to support the statement.
Change-Id: I5a06b93b1e4a3b9ac9c64055eac2a45d71d71384
Issue-ID: VNFRQTS-538
Signed-off-by: Hagop Bozawglanian <hagop.bozawglanian@att.com>
Diffstat (limited to 'jjb/vnfrqts')
| -rw-r--r-- | jjb/vnfrqts/build-and-upload.yaml | 2 | ||||
| -rw-r--r-- | jjb/vnfrqts/post-upload-artifact.sh | 5 | ||||
| -rw-r--r-- | jjb/vnfrqts/vnfrqts-requirements.yaml | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml index 1e7b8cfb4..d3fd4a6a1 100644 --- a/jjb/vnfrqts/build-and-upload.yaml +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -9,6 +9,7 @@ pre_script: '' post_script: '' artifact_name: '' + project_id: '' project-type: freestyle concurrent: true @@ -56,6 +57,7 @@ - inject: properties-content: | ARTIFACT_NAME={artifact_name} + PROJECT_ID={project_id} - shell: '{obj:post_script}' - lf-provide-maven-settings-cleanup diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh index 77193128a..2de1f4d8c 100644 --- a/jjb/vnfrqts/post-upload-artifact.sh +++ b/jjb/vnfrqts/post-upload-artifact.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e -o pipefail -echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$JOB_BASE_NAME/$GERRIT_BRANCH/$ARTIFACT_NAME" -curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$JOB_BASE_NAME/$GERRIT_BRANCH/$ARTIFACT_NAME"
\ No newline at end of file +cd $WORKSPACE/docs/data +echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME" +curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
\ No newline at end of file diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index 1b3f166a7..7bb260e4b 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -20,5 +20,6 @@ jobs: - '{project-name}-{stream}-build-and-upload': pre_script: !include-raw-escape: pre-build-needs.sh - artifact_name: docs/data/needs.json + artifact_name: needs.json + project_id: org.onap.vnfrqts.requirements post_script: !include-raw-escape: post-upload-artifact.sh |