Merge pull request #95 from shreelakshmijoshi/updating-setup.md

Refactor files
datakaveri · Apr 15, 2024 · fb4f457 · fb4f457
2 parents d4fcc91 + 6e5dc0d
commit fb4f457
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,7 +70,7 @@ pipeline {
     stage('Start Data-Ingestion Server for Integration testing'){
       steps{
         script{
-            sh 'scp src/test/resources/IUDX-Data-Ingestion-Server-APIs-V5.0.0.postman_collection.json jenkins@jenkins-master:/var/lib/jenkins/iudx/di/Newman/'
+            sh 'scp src/test/resources/IUDX-Data-Ingestion-Server-APIs-V5.5.0.postman_collection.json jenkins@jenkins-master:/var/lib/jenkins/iudx/di/Newman/'
             sh 'docker compose -f docker-compose.test.yml up -d integTest'
             sh 'sleep 45'
         }
@@ -90,7 +90,7 @@ pipeline {
           script{
             startZap ([host: 'localhost', port: 8090, zapHome: '/var/lib/jenkins/tools/com.cloudbees.jenkins.plugins.customtools.CustomTool/OWASP_ZAP/ZAP_2.11.0'])
               sh 'curl http://127.0.0.1:8090/JSON/pscan/action/disableScanners/?ids=10096'
-              sh 'HTTP_PROXY=\'127.0.0.1:8090\' newman run /var/lib/jenkins/iudx/di/Newman/IUDX-Data-Ingestion-Server-APIs-V5.0.0.postman_collection.json -e /home/ubuntu/configs/di-postman-env.json -n 2 --insecure -r htmlextra --reporter-htmlextra-export /var/lib/jenkins/iudx/di/Newman/report/report.html --reporter-htmlextra-skipSensitiveData'
+              sh 'HTTP_PROXY=\'127.0.0.1:8090\' newman run /var/lib/jenkins/iudx/di/Newman/IUDX-Data-Ingestion-Server-APIs-V5.5.0.postman_collection.json -e /home/ubuntu/configs/di-postman-env.json -n 2 --insecure -r htmlextra --reporter-htmlextra-export /var/lib/jenkins/iudx/di/Newman/report/report.html --reporter-htmlextra-skipSensitiveData'
             runZapAttack()
           }
         }
@@ -158,7 +158,7 @@ pipeline {
           steps {
             node('built-in') {
               script{
-                sh 'newman run /var/lib/jenkins/iudx/di/Newman/IUDX-Data-Ingestion-Server-APIs-V5.0.0.postman_collection.json -e /home/ubuntu/configs/cd/di-postman-env.json --insecure -r htmlextra --reporter-htmlextra-export /var/lib/jenkins/iudx/di/Newman/report/cd-report.html --reporter-htmlextra-skipSensitiveData'
+                sh 'newman run /var/lib/jenkins/iudx/di/Newman/IUDX-Data-Ingestion-Server-APIs-V5.5.0.postman_collection.json -e /home/ubuntu/configs/cd/di-postman-env.json --insecure -r htmlextra --reporter-htmlextra-export /var/lib/jenkins/iudx/di/Newman/report/cd-report.html --reporter-htmlextra-skipSensitiveData'
               }
             }
           }

diff --git a/configs/config-dev.json b/configs/config-dev.json
@@ -6,6 +6,7 @@
 	"clusterId": "iudx-di-cluster",
 	"commonConfig" : {
 		"dxApiBasePath" : "/ngsi-ld/v1",
+		"iudxApiBasePath": "/iudx/v1",
 		"dxCatalogueBasePath": "/iudx/cat/v1",
 		"dxAuthBasePath": "/auth/v1"
 	},

diff --git a/docs/openapi.yaml b/docs/openapi.yaml
@@ -16,7 +16,7 @@ consumes:
 
 info:
   title: Data Exchange Data Ingestion Server APIs
-  version: 5.0.0
+  version: 5.5.0
   description: >
     # Introduction
 

diff --git a/src/test/resources/DI Jenkins Pipeline.postman_environment-V5.0.0.json b/src/test/resources/DI Jenkins Pipeline.postman_environment-V5.0.0.json
@@ -4,19 +4,19 @@
 	"values": [
 		{
 			"key": "clientID",
-			"value": "4b0d2450-13da-4846-b9da-de31c3fca256",
+			"value": "",
 			"type": "default",
 			"enabled": true
 		},
 		{
 			"key": "clientSecret",
-			"value": "46a0af39eb5b347c9e73f6d707e533a5ebce5088",
+			"value": "",
 			"type": "default",
 			"enabled": true
 		},
 		{
 			"key": "base_url",
-			"value": "di.iudx.io",
+			"value": "",
 			"type": "default",
 			"enabled": true
 		},

diff --git a/...erver-APIs-V5.0.0.postman_collection.json → ...erver-APIs-V5.5.0.postman_collection.json b/...erver-APIs-V5.0.0.postman_collection.json → ...erver-APIs-V5.5.0.postman_collection.json
@@ -1,7 +1,7 @@
 {
 	"info": {
 		"_postman_id": "a79ebce7-d80c-4faf-95d0-5a8fc1e856f6",
-		"name": "IUDX-Data-Ingestion-Server-APIs-V5.0.0",
+		"name": "IUDX-Data-Ingestion-Server-APIs-V5.5.0",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "20457128"
 	},