summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2021-01-26 13:53:44 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2021-01-26 13:53:44 +0200
commitf0e28e0328cff5d1f339449df9a8643f23ee2c69 (patch)
tree169fbadf5799a21e455eef5a6875170aa92156a7
parent430c39802c8336c3aa0dd3e46ef0087db817a5b8 (diff)
Remove obsolete docker templates
- remove obsolete templates related to docker building and tagging in discarded version of review and merge verification jobs Issue-ID: INT-1823, INT-1833 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I1d584952ea94565f62ea7031f248a49f8f7e72d0
-rw-r--r--jjb/ccsdk/distribution.yaml9
-rw-r--r--jjb/global-templates-docker.yaml48
-rw-r--r--jjb/global-templates-golang.yaml54
-rw-r--r--jjb/integration/integration-maven-jobs.yaml157
-rw-r--r--jjb/music/music-distributed-kv-store.yaml6
5 files changed, 0 insertions, 274 deletions
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index f962c1473..ba20563ec 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -20,15 +20,6 @@
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:
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index c340b1ea3..23a554ba9 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -303,51 +303,3 @@
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
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index b19fe3806..72004dc8d 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -198,57 +198,3 @@
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
index 259fb4ebe..000000000
--- a/jjb/integration/integration-maven-jobs.yaml
+++ /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: ''
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 6812484a2..0985d66c2 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -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':