Merge "creat ci job for kpi computation ms"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 26 Jan 2021 17:56:26 +0000 (17:56 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 26 Jan 2021 17:56:26 +0000 (17:56 +0000)
global-jjb
jjb/ccsdk/distribution.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-golang.yaml
jjb/integration/integration-maven-jobs.yaml [deleted file]
jjb/integration/integration-templates-csit.yaml
jjb/music/music-distributed-kv-store-csit.yaml
jjb/music/music-distributed-kv-store.yaml

index 413bdb2..4b1496d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 413bdb2e77dcc2055e05476930f13874a2fae244
+Subproject commit 4b1496d42d0b44c650fc700234d30ae35dc4176d
index f962c14..ba20563 100644 (file)
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-snapshot:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-snapshot-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-staging':
-          script:
-            !include-raw-escape: 'tag-ccsdk-distribution-images-staging.sh'
 
     project: 'ccsdk/distribution'
     stream:
index adf6310..f15beef 100644 (file)
@@ -2,28 +2,28 @@
 - project:
     name: dcaegen2-collectors-snmptrap
     project-name: 'dcaegen2-collectors-snmptrap'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
     project: 'dcaegen2/collectors/snmptrap'
+    python-version: python3.6
+    tox-dir: '.'
+    tox-envs: ''
     stream:
       - 'master':
           branch: 'master'
       - 'guilin':
           branch: 'guilin'
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
+    subproject:
+      - 'snmptrap':
+          pattern: '**'
+          path: 'snmptrap'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
+      - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
index c340b1e..23a554b 100644 (file)
 
     publishers:
       - lf-infra-publish
-
-- job-template:
-    # Job template for tagging snapshot docker images
-    # identified by given unique tag as STAGING
-    # in project-specific CSIT versioning flow
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. run a specified shell builder for tagging
-    #
-
-    name: '{project-name}-{stream}-docker-staging'
-    project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-unique-docker-tag:
-          unique-docker-tag: ''
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - shell: '{script}'
-
-    publishers:
-      - lf-infra-publish
index b19fe38..72004dc 100644 (file)
 
     publishers:
       - lf-infra-publish
-
-- job-template:
-    # Job template for building and pushing uniquely tagged
-    # snapshot docker images in project-specific CSIT flow
-    #
-    # golangver can be set to golang110 or golang111
-    # depending on what version is needed by the project
-    # default is golang110
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. run a specified shell builder
-    #
-
-    name: '{project-name}-{stream}-golang-docker-snapshot'
-    golangver: 'golang110'
-    project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-unique-docker-tag:
-          unique-docker-tag: ''
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - '{golangver}'
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - docker-login
-
-      - shell: '{script}'
-
-    publishers:
-      - lf-infra-publish
diff --git a/jjb/integration/integration-maven-jobs.yaml b/jjb/integration/integration-maven-jobs.yaml
deleted file mode 100644 (file)
index 259fb4e..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-####################
-# COMMON FUNCTIONS #
-####################
-
-- integration_maven_common: &integration_maven_common
-    # This common maven base template is based on
-    # lf-maven-common in global-jjb/jjb/lf-maven-jobs.yaml
-    # and adjusted for jobs in project-specific CSIT flow
-
-    name: integration-maven-common
-
-    ######################
-    # Default parameters #
-    ######################
-
-    archive-artifacts: >
-      **/*.log
-      **/hs_err_*.log
-      **/target/**/feature.xml
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/target/surefire-reports/*-output.txt
-
-    #####################
-    # Job Configuration #
-    #####################
-
-    project-type: freestyle
-    node: "{build-node}"
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
-    parameters:
-      - lf-infra-parameters:
-          project: "{project}"
-          branch: "{branch}"
-          stream: "{stream}"
-      - lf-infra-maven-parameters:
-          mvn-opts: "{mvn-opts}"
-          mvn-params: "{mvn-params}"
-          mvn-version: "{mvn-version}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: "{archive-artifacts}"
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-          git-url: "{git-url}"
-          refspec: "$GERRIT_REFSPEC"
-          branch: "$GERRIT_BRANCH"
-          submodule-recursive: "{submodule-recursive}"
-          submodule-timeout: "{submodule-timeout}"
-          submodule-disable: "{submodule-disable}"
-          choosing-strategy: "gerrit"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-
-    publishers:
-      - lf-infra-publish
-
-#############################
-# Maven Snapshot for Docker #
-#############################
-
-- integration_maven_docker_snapshot: &integration_maven_docker_snapshot
-    name: integration-maven-docker-snapshot
-
-    builders:
-      - lf-infra-pre-build
-      - lf-jacoco-nojava-workaround
-      - lf-maven-install:
-          mvn-version: "{mvn-version}"
-      - lf-update-java-alternatives:
-          java-version: "{java-version}"
-      - lf-infra-docker-login:
-          global-settings-file: "{mvn-global-settings}"
-          settings-file: "{mvn-settings}"
-      # must provide maven settings AFTER docker-login due to its cleanup
-      - lf-provide-maven-settings:
-          global-settings-file: "{mvn-global-settings}"
-          settings-file: "{mvn-settings}"
-      - lf-maven-versions-plugin:
-          maven-versions-plugin: "{maven-versions-plugin}"
-          version-properties-file: "{version-properties-file}"
-          mvn-version: "{mvn-version}"
-          mvn-pom: "{mvn-pom}"
-          mvn-settings: "{mvn-settings}"
-      - inject:
-          properties-content: |
-            CONTAINER_PULL_REGISTRY={container-public-registry}
-            CONTAINER_PUSH_REGISTRY={container-snapshot-registry}
-      - lf-maven-build:
-          mvn-goals: "{mvn-goals}"
-      - lf-sigul-sign-dir:
-          sign-artifacts: "{sign-artifacts}"
-          sign-dir: "$WORKSPACE/m2repo"
-          sign-mode: "{sign-mode}"
-      - lf-provide-maven-settings-cleanup
-
-- job-template:
-    # Job template for creating snapshot docker images
-    # identified by given unique tag with maven
-    # in project-specific CSIT flow
-
-    name: "{project-name}-{stream}-maven-docker-snapshot"
-    id: gerrit-maven-docker-snapshot
-    <<: *integration_maven_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *integration_maven_docker_snapshot
-
-    ######################
-    # Default parameters #
-    ######################
-
-    branch: master
-    build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
-    build-timeout: 60
-    disable-job: false
-    git-url: "$GIT_URL/$PROJECT"
-    github-url: "https://github.com"
-    java-version: openjdk8
-    maven-versions-plugin: false
-    version-properties-file: version.properties
-    mvn-central: false
-    mvn-global-settings: global-settings
-    mvn-goals: clean deploy
-    mvn-opts: ""
-    mvn-params: ""
-    maven-version: mvn36
-    ossrh-profile-id: ""
-    mvn-pom: ""
-    sign-artifacts: false
-    sign-mode: serial
-    stream: master
-    submodule-recursive: true
-    submodule-timeout: 10
-    submodule-disable: false
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-
-      - integration-unique-docker-tag:
-          unique-docker-tag: ''
index 86206db..d3face1 100644 (file)
           files: '**'
     publishers:
       - lf-infra-publish
-
-- job-template:
-    # Job template for review verification jobs in 
-    # project-specific CSIT flow
-    #
-    # The purpose of this job template is to:
-    #  1. trigger snapshot docker build job
-    #  2. trigger CSIT job
-    #  3. give a verify vote to the triggering review
-    #
-
-    name: '{project-name}-review-verification-{stream}'
-    disabled: '{disabled}'
-    project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: '{build-days-to-keep}'
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-    builders:
-      - lf-infra-pre-build
-      - lf-maven-install:
-          mvn-version: "{mvn-version}"
-      - lf-update-java-alternatives:
-          java-version: "{java-version}"
-      - lf-provide-maven-settings:
-          global-settings-file: "{mvn-global-settings}"
-          settings-file: "{mvn-settings}"
-      - trigger-builds:
-         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot"
-            predefined-parameters: |
-              UNIQUE_DOCKER_TAG=$BUILD_TAG
-              PROJECT=$PROJECT
-              BRANCH=$BRANCH
-              GERRIT_REFSPEC=$GERRIT_REFSPEC
-            block: true
-      - trigger-builds:
-         -  project: "{project-name}-{stream}-project-csit"
-            predefined-parameters: |
-              UNIQUE_DOCKER_TAG=$BUILD_TAG
-              PROJECT=$PROJECT
-              BRANCH=$BRANCH
-              GERRIT_REFSPEC=$GERRIT_REFSPEC
-            block: true
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    # Job template for merge verification jobs in 
-    # project-specific CSIT flow
-    #
-    # The purpose of this job template is to trigger
-    # the following jobs in sequence:
-    #  1. snapshot docker build job
-    #  2. CSIT job
-    #  3. docker staging job
-    #
-
-    name: '{project-name}-merge-verification-{stream}'
-    disabled: '{disabled}'
-    project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: '{build-days-to-keep}'
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-    builders:
-      - lf-infra-pre-build
-      - lf-maven-install:
-          mvn-version: "{mvn-version}"
-      - lf-update-java-alternatives:
-          java-version: "{java-version}"
-      - lf-provide-maven-settings:
-          global-settings-file: "{mvn-global-settings}"
-          settings-file: "{mvn-settings}"
-      - trigger-builds:
-         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot"
-            predefined-parameters: |
-              UNIQUE_DOCKER_TAG=$BUILD_TAG
-              PROJECT=$PROJECT
-              BRANCH=$BRANCH
-              GERRIT_REFSPEC=$GERRIT_REFSPEC
-            block: true
-      - trigger-builds:
-         -  project: "{project-name}-{stream}-project-csit"
-            predefined-parameters: |
-              UNIQUE_DOCKER_TAG=$BUILD_TAG
-              PROJECT=$PROJECT
-              BRANCH=$BRANCH
-              GERRIT_REFSPEC=$GERRIT_REFSPEC
-            block: true
-      - trigger-builds:
-         -  project: "{project-name}-{stream}-docker-staging"
-            predefined-parameters: |
-              UNIQUE_DOCKER_TAG=$BUILD_TAG
-              PROJECT=$PROJECT
-              BRANCH=$BRANCH
-              GERRIT_REFSPEC=$GERRIT_REFSPEC
-            block: true
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-    publishers:
-      - lf-infra-publish
-
index 3f53eea..ab49147 100644 (file)
@@ -1,18 +1,25 @@
----
-- project:
-    name: music-distributed-kv-store-csit
-    jobs:
-      - '{project-name}-{stream}-project-csit'
-      - '{project-name}-review-verification-{stream}'
-      - '{project-name}-merge-verification-{stream}'
-    project-name: 'music-distributed-kv-store'
-    project: 'music/distributed-kv-store'
-    disabled: true
-    stream: 'master'
-    artifact-type: 'golang'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'music-distributed-kv-store-settings'
-    mvn-global-settings: global-settings
-    robot-options: ''
-    branch: 'master'
+# Integration templates no longer support these 
+# job definitions; if Music CSIT needs to be restored,
+# '{project-name}-review-verification-golang-{stream}'
+# '{project-name}-merge-verification-golag-{stream}'
+# would have to be added to integration templates and 
+# applied here
+#  
+#---
+#- project:
+#    name: music-distributed-kv-store-csit
+#    jobs:
+#      - '{project-name}-{stream}-project-csit'
+#      - '{project-name}-review-verification-{stream}'
+#      - '{project-name}-merge-verification-{stream}'
+#    project-name: 'music-distributed-kv-store'
+#    project: 'music/distributed-kv-store'
+#    disabled: true
+#    stream: 'master'
+#    artifact-type: 'golang'
+#    java-version: openjdk11
+#    mvn-version: 'mvn36'
+#    mvn-settings: 'music-distributed-kv-store-settings'
+#    mvn-global-settings: global-settings
+#    robot-options: ''
+#    branch: 'master'
index 6812484..0985d66 100644 (file)
@@ -9,12 +9,6 @@
       - '{project-name}-{stream}-docker-golang-shell-daily':
           script:
             !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
-      - '{project-name}-{stream}-golang-docker-snapshot':
-          script:
-            !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
-      - '{project-name}-{stream}-docker-staging':
-          script:
-            !include-raw-escape: 'tag-music-distributed-kv-store-image-staging.sh'
     project: 'music/distributed-kv-store'
     stream:
       - 'master':