summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/vnfrqts/build-and-upload.yaml2
-rw-r--r--jjb/vnfrqts/post-upload-artifact.sh5
-rw-r--r--jjb/vnfrqts/vnfrqts-requirements.yaml3
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