Merge "Remove irrelevant VNFSDK CSIT trigger jobs"

diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md
index bd734c7..8904105 100644 (file)
--- a/Sandbox_Setup.md
+++ b/Sandbox_Setup.md
@@ -53,6 +53,7 @@ jenkins-jobs test --recursive jjb/
 
 Backup the jenkins.ini.example to jenkins.ini
 
+`mkdir -p ~/.config/jenkins_jobs`
 `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini`
 
 After copying the jenkins.ini.example, modify `jenkins.ini` with your
@@ -72,9 +73,10 @@ password= <Refer below steps to get API token>
 url=https://jenkins.onap.org/sandbox
 query_plugins_info=False
 ```
-### How to retrieve API token?
+### How to retrieve username and API token?
 Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user
-page by clicking on your username. Click **Configure** and then click **Add new Token**.
+page by clicking on your username - `Jenkins User ID` on this page is your Jenkins
+Sandbox username. Click **Configure** and then click **Add new Token**.
 After that specify a token name (optional) and click on **Generate** to generate and show
 new token. Please note down your token and store it securely.
 
@@ -106,18 +108,14 @@ The output directory will contain files with the XML configurations.
 
 ## To Update a job:
 
-Ensure you’ve configured your `jenkins_jobs.ini` and verified it by
-outputting valid XML descriptions of Jenkins jobs. Upon successful
-verification, execute the following command to update the job to the
-Jenkins sandbox.
+Ensure you’ve configured your `jenkins_jobs.ini` and verified the changes by
+outputting valid XML descriptions of the relevant Jenkins jobs. Upon successful
+verification, execute the following command to update the job to the Jenkins sandbox.
 
 `jenkins-jobs update jjb/ <job-name>`
 
 **Example:** `jenkins-jobs update jjb/ sdc-master-verify-java`
 
-Note that there will be some 403 errors along the way for failed view creation attempts even
-when the job creation succeeds.
-
 ## Trigger jobs from Jenkins Sandbox:
 
 Once you push the Jenkins job configuration to the ONAP Sandbox environment,

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 0895a82..4879738 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -42,8 +42,6 @@
           mvn-goals: 'clean package docker:build -DpushImageTag'
           mvn-params: '-f components/slice-analysis-ms/pom.xml'
           pattern: 'components/slice-analysis-ms/**'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index ff4a3f8..ca2279e 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -11,8 +11,6 @@
       functionality:
           - "certservice":
                 trigger_jobs:
-                    - "oom-platform-cert-service-{stream}-merge-java"
           - "postprocessor":
                 trigger_jobs:
-                    - "oom-platform-cert-service-{stream}-merge-java"
       robot-options: ""