diff options
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg | 2 | ||||
| -rw-r--r-- | jjb/ccsdk/distribution.yaml | 4 | ||||
| -rw-r--r-- | jjb/cps/cps.yaml | 6 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 8 | ||||
| -rw-r--r-- | jjb/integration/integration-maven-jobs.yaml | 16 | ||||
| -rw-r--r-- | jjb/music/music-distributed-kv-store-csit.yaml | 1 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 19 | ||||
| -rw-r--r-- | packer/provision/helm.yaml | 11 | ||||
| -rwxr-xr-x | shell/helm-repo-init.sh | 3 |
10 files changed, 56 insertions, 18 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg index b0cbe0774..96ee7bd5e 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -1,4 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20201211-071340.623 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20201212-033204.217 LABELS=ubuntu1804-helm-2c-1g HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=50 diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 6f0c160f0..f962c1473 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -20,11 +20,11 @@ cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - - gerrit-maven-docker-snapshot-PoC: + - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' maven-versions-plugin: true - '{project-name}-{stream}-docker-staging': script: diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index c6206524e..5593b1074 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -39,7 +39,7 @@ - '{project-name}-{stream}-merge-java' - 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: centos7-docker-8c-8g @@ -55,7 +55,7 @@ mvn-settings: 'cps-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g + build-node: centos7-docker-8c-8g - project: name: cps-sonar @@ -70,7 +70,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1804-builder-4c-4g + build-node: centos7-docker-8c-8g project: 'cps' project-name: 'cps' branch: 'master' diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index e8fb13a47..2697d1871 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -199,7 +199,7 @@ - lf-provide-maven-settings-cleanup - job-template: - name: '{project-name}-{stream}-stage-helm' + name: '{project-name}-{stream}-release-helm' # Job template for Helm stage jobs <<: *helm_job_boiler_plate @@ -211,12 +211,10 @@ submodule-recursive: '{submodule-recursive}' triggers: - - pollscm: - cron: '0 22 * * *' - gerrit: trigger-on: - comment-added-contains-event: - comment-contains-value: '^stage-helm$' + comment-contains-value: '^release-helm$' builders: - lf-infra-pre-build @@ -229,7 +227,7 @@ server-id: oom-helm - inject: properties-content: | - BUILD_TYPE=staging + BUILD_TYPE=release - shell: '{obj:post_build_script}' - lf-provide-maven-settings-cleanup diff --git a/jjb/integration/integration-maven-jobs.yaml b/jjb/integration/integration-maven-jobs.yaml index 71cadeff8..259fb4ebe 100644 --- a/jjb/integration/integration-maven-jobs.yaml +++ b/jjb/integration/integration-maven-jobs.yaml @@ -1,4 +1,12 @@ +#################### +# 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 ###################### @@ -46,7 +54,7 @@ submodule-recursive: "{submodule-recursive}" submodule-timeout: "{submodule-timeout}" submodule-disable: "{submodule-disable}" - choosing-strategy: default + choosing-strategy: "gerrit" wrappers: - lf-infra-wrappers: @@ -96,8 +104,12 @@ - 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-PoC + id: gerrit-maven-docker-snapshot <<: *integration_maven_common # yamllint disable-line rule:key-duplicates <<: *integration_maven_docker_snapshot diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 4dd27b6bc..3f53eeaac 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -7,6 +7,7 @@ - '{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 diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 9263a28a0..46da25852 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -18,7 +18,6 @@ cd kubernetes/ make HELM_BIN=helm3 common make HELM_BIN=helm3 {subproject} - oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh stream: - "master": @@ -50,9 +49,8 @@ build-timeout: 240 - "{project-name}-{stream}-merge-helm": build_script: "{oom_build_script}" - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - - "{project-name}-{stream}-stage-helm": + - "{project-name}-{stream}-release-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index e02d61259..2284650f5 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -36,6 +36,25 @@ maven-version: 'mvn35' - project: + name: sdc-sdc-distribution-client-integration-pairwise + java-version: openjdk11 + jobs: + - '{project-name}-{stream}-integration-pairwise' + build-node: ubuntu1804-docker-8c-8g + project: 'sdc/sdc-distribution-client' + project-name: 'sdc-sdc-distribution-client' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'sdc-sdc-distribution-client-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + maven-version: 'mvn35' + mvn-params: ' -P integration-pairwise' + +- project: name: sdc-sdc-distribution-client-sonar jobs: - gerrit-maven-sonar diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index 0b14beee9..459fbb1fc 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -46,7 +46,7 @@ - name: 'Fetch tar.gz' get_url: url: "https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz" - dest: "/tmp/helm3/helm-v{{helm3_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3 - name: 'Unarchive' unarchive: src: "/tmp/helm3/helm-v{{helm3_version}}-linux-amd64.tar.gz" @@ -61,6 +61,15 @@ - name: 'Check kubectl.' command: 'which kubectl' + - name: Install helm3 + shell: | + echo "----> Installing helm3" + wget 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz' + mv linux-amd64/helm /usr/local/bin/helm3 + which helm3 + become: true + - name: 'Install ChartMuseum {{chartmuseum_version}}' block: - name: 'Fetch bin' diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh index 6bf1338e3..c3b0a36d6 100755 --- a/shell/helm-repo-init.sh +++ b/shell/helm-repo-init.sh @@ -3,6 +3,7 @@ set -e -o pipefail mkdir -p ".chartstorage" -chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" & +sudo mount -t tmpfs -o size=128M tmpfs .chartstorage +chartmuseum --debug --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" & helm3 plugin install https://github.com/chartmuseum/helm-push.git helm3 repo add local http://localhost:6464 |