From: Jessica Wagantall Date: Thu, 27 Jun 2019 17:29:46 +0000 (+0000) Subject: Merge "Archive Coverity analysed files list to the logs server" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2e84d7a1312d62f05193d1d5c3e9b0905c5a993f;hp=097f7349d3b2a918f67468c3c2d2b63b946987d1;p=ci-management.git Merge "Archive Coverity analysed files list to the logs server" --- diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index abdc7c73c..1ec847026 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -6,7 +6,7 @@ that can be used before pushing job templates to the production It is configured similar to the ONAP [ci-management] production instance; however, it cannot publish artifacts or vote in Gerrit. Be aware that this is a -test environment, and as such there a limited allotment of minions to test on +test environment, and as such there is a limited allotment of minions to test on before pushing code to the ONAP repos. Keep the following points in mind prior to beginning work on ONAP Jenkins Sandbox environment: @@ -19,11 +19,12 @@ environment: these VMs directly. Before you proceed further, ensure you have a Linux Foundation ID (LFID), which is -required to access Gerrit & Jenkins. Also, to get an access to Sandbox environment -please send email to helpdesk@onap.org (LF helpdesk team) +required to access Gerrit & Jenkins. Also, to extend your permissions for uploading +Jenkins configurations to Sandbox environment, you must raise a ticket to +[Linux Foundation Help Center](https://support.linuxfoundation.org) To download **ci-management**, execute the following command to clone the -**ci-managment** repository. +**ci-management** repository. `git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \ $(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \ @@ -48,28 +49,28 @@ jenkins-jobs --version jenkins-jobs test --recursive jjb/ ``` -### Make a copy of the example JJB config file (in the builder/ directory) +### Make a copy of the example JJB config file (in the ci-management/ directory) Backup the jenkins.ini.example to jenkins.ini `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini` After copying the jenkins.ini.example, modify `jenkins.ini` with your -**Jenkins LFID username**, **API token** and **ONAP jenkins sandbox URL** +**Jenkins LFID username** and **API token** ``` [job_builder] ignore_cache=True keep_descriptions=False -include_path=.:scripts:~/git/ +include_path=. recursive=True +retain_anchors=True [jenkins] user=jwagantall password= url=https://jenkins.onap.org/sandbox -This is deprecated, use job_builder section instead -ignore_cache=True +query_plugins_info=False ``` ### How to retrieve API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user @@ -77,7 +78,7 @@ page by clicking on your username. Click **Configure** and then click **Add new 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. -To work on existing jobs or create new jobs, navigate to the `/jjb` directory where you +To work on existing jobs or create new jobs, navigate to the `ci-management/jjb/` directory where you will find all job templates for the project. Follow the below commands to test, update or delete jobs in your sandbox environment. @@ -105,7 +106,7 @@ The output directory will contain files with the XML configurations. ## To Update a job: -Ensure you’ve configured your `jenkins.ini` and verified it by +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. @@ -114,6 +115,9 @@ Jenkins sandbox. **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-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 0d6687f8b..7f9c4da68 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,10 @@ stream: - 'master': branch: 'master' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' - 'dublin': branch: 'dublin' + mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version' # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -23,7 +25,6 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' script: '/bin/true' - project: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e49aed8aa..ab7b8aadd 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -15,7 +15,7 @@ disabled: true - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 3391fac20..3a75eca5e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -21,8 +21,6 @@ mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-{stream}-release-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' project: 'vid' stream: - 'master': @@ -34,24 +32,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: vid-docker - project-name: 'vid' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - project: 'vid' - stream: - - 'master': - branch: 'master' - - 'dublin': - branch: 'dublin' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' - build-node: queue-docker-4c-4g - #- project: # name: vid-docker-arm64 # project-name: 'vid-arm64'