diff options
| -rw-r--r-- | jjb/integration/integration-csit.yaml | 8 | ||||
| -rw-r--r-- | jjb/lf-infra-releasedockerhub.yaml | 68 | ||||
| -rw-r--r-- | jjb/so/so-libs.yaml | 5 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 5 | ||||
| -rw-r--r-- | packer/provision/local-docker.yaml | 6 | ||||
| -rw-r--r-- | shell/run_releasedockerhub.sh | 56 |
6 files changed, 142 insertions, 6 deletions
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 5a0eedd61..8f8e0947f 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -15,3 +15,11 @@ - 'vCPE': trigger_jobs: robot-options: '' + +- project: + name: integration-csit-info + project-name: integration-csit + jobs: + - gerrit-info-yaml-verify + project: integration/csit + branch: master diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml new file mode 100644 index 000000000..ca2ea85b0 --- /dev/null +++ b/jjb/lf-infra-releasedockerhub.yaml @@ -0,0 +1,68 @@ +--- +- builder: + name: lf-onap-releasedockerhub-macro + builders: + - shell: !include-raw-escape: + - ../shell/run_releasedockerhub.sh + ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}" + + +- job: + name: lf-onap-release-docker-hub + build-timeout: 90 + + project-type: freestyle + node: ubuntu1604-docker-8c-8g ## Probably don't need this much + disable-job: false + disabled: '{disable-job}' + + # Runs once a week + triggers: + - timed: '@weekly' + +# Define needed parameters for lf-infra-docker-login + parameters: + - string: + name: DOCKER_REGISTRY + default: 'nexus3.onap.org' + - string: + name: REGISTRY_PORTS + default: '10002' + - string: + name: DOCKERHUB_REGISTRY + default: 'docker.io' + +# Define needed parameters for lf-onap-releasedockerhub-macro + - string: + name: RELEASEDOCKERHUB_ORG + default: 'onap' + description: '' + - string: + name: RELEASEDOCKERHUB_REPO + default: '' + description: 'Only match repos that contains this string' + - string: + name: RELEASEDOCKERHUB_EXACT + default: '' + description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO ' + - string: + name: RELEASEDOCKERHUB_SUMMARY + default: 'Yes' + description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes' + - string: + name: RELEASEDOCKERHUB_VERBOSE + default: '' + description: 'Provides a verbose output of the operations. Activate with Yes' + - string: + name: RELEASEDOCKERHUB_COPY + default: 'Yes' + description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes' + + + builders: + - lf-infra-pre-build ## shell/python-tools-install.sh + - lf-infra-docker-login: + global-settings-file: 'global-settings' + settings-file: 'onap-releasedockerhub-authz-settings' + - lf-onap-releasedockerhub-macro: + diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 8ad44cb8d..acc45f14d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -30,6 +30,11 @@ name: so-libs-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'so/libs' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 9d7d894ce..4b63bf417 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -38,6 +38,11 @@ name: so-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' max-git-repo-age-hours: 48 build-node: ubuntu1604-builder-4c-4g diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index c3c9f1731..7b9f9c0c6 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -67,12 +67,6 @@ become: true - apt_repository: - repo: ppa:jonathonf/python-3.6 - state: present - become: true - when: ansible_distribution == 'Ubuntu' - - - apt_repository: repo: ppa:deadsnakes/ppa state: present become: true diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh new file mode 100644 index 000000000..42771af6e --- /dev/null +++ b/shell/run_releasedockerhub.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2019 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## + +echo "---> run_releasedockerhub.sh" +# Ensure we fail the job if any steps fail +# Disable 'globbing' +set -euf -o pipefail + +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv lftools + +if [ ! -v RELEASEDOCKERHUB_ORG ] +then + echo "RELEASEDOCKERHUB_ORG is not defined. For onap set it to 'onap'" + exit 1 +fi + +cmd_str="--org $RELEASEDOCKERHUB_ORG" +if [ -v RELEASEDOCKERHUB_SUMMARY ] +then + cmd_str+=" --summary" +fi +if [ -v RELEASEDOCKERHUB_VERBOSE ] +then + cmd_str+=" --verbose" +fi +if [ -v RELEASEDOCKERHUB_REPO ] +then + cmd_str+=" --repo $RELEASEDOCKERHUB_REPO" +fi +if [ -v RELEASEDOCKERHUB_EXACT ] +then + cmd_str+=" --exact" +fi + + +if [ -v RELEASEDOCKERHUB_COPY ] +then + cmd_str+=" --copy" +fi + +echo "cmd_str = >>$cmd_str<<" + +# Run the releasedockerhub command in lftools +lftools nexus docker releasedockerhub $cmd_str |