Final patch for [AETHER-778], [AETHER-779] and [AETHER-782]
- Enables new CI/CD jobs for stable and master builds
- Disable old CI/CD jobs
- Removes taggging step from the publish script
- Add weekly job for master
Change-Id: Ie99565305c9f5119503d218097771ed69e80a656
diff --git a/jjb/templates/tost-onos-jobs.yaml b/jjb/templates/tost-onos-jobs.yaml
index 50bbbef..3e03cf3 100644
--- a/jjb/templates/tost-onos-jobs.yaml
+++ b/jjb/templates/tost-onos-jobs.yaml
@@ -7,7 +7,7 @@
description: |
Created by {id} job-template from ci-management/jjb/tost-onos-jobs.yaml, script pipeline/tost-onos-publish.groovy<br/>
Runs docker-build with the following env. variables - '{extraEnvironmentVars}' and then publish the image on {docker-registry}/{docker-repo}. <br/>
- Triggered also nightly. <br/>
+ Triggered also at {timed}. <br/>
triggers:
- onf-infra-gerrit-trigger-merge:
@@ -16,7 +16,7 @@
branch-regexp: '{branch-regexp}'
file-include-regexp: '{all-files-regexp}'
dependency-jobs: '{dependency-jobs}'
- - timed: "@midnight"
+ - timed: '{timed}'
properties:
- onf-infra-onfstaff-private:
@@ -86,9 +86,107 @@
default: '{extraEnvironmentVars}'
description: "Provide extra environment variables to the build"
+ - string:
+ name: buildDate
+ default: '{buildDate}'
+ description: "To add the build date to the tag"
+
project-type: pipeline
concurrent: true
extraEnvironmentVars: ""
sandbox: true
+ buildDate: 'true'
+
+ dsl: !include-raw-escape: ../pipeline/tost-onos-publish.groovy
+
+- job-template:
+ id: weekly-tost-onos-docker-publish
+ name: 'weekly-tost-onos-docker-publish{name-extension}'
+ disabled: '{disable-job}'
+ description: |
+ Created by {id} job-template from ci-management/jjb/tost-onos-jobs.yaml, script pipeline/tost-onos-publish.groovy<br/>
+ Runs {timed} docker-build with the following env. variables - '{extraEnvironmentVars}' and then publish the image on {docker-registry}/{docker-repo}. <br/>
+
+ triggers:
+ - timed: '{timed}'
+
+ properties:
+ - onf-infra-onfstaff-private:
+ - onf-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ artifact-num-to-keep: '{artifact-num-to-keep}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ parameters:
+ - string:
+ name: buildNode
+ default: '{bigger-build-node}'
+ description: 'Name of the Jenkins build executor to run the job on'
+
+ - string:
+ name: gitUrl
+ default: '$GIT_URL/$GERRIT_PROJECT'
+ description: 'URL to the git repo'
+
+ - string:
+ name: GERRIT_PATCHSET_REVISION
+ default: 'master'
+ description: 'git ref to build (commit hash or tag)'
+
+ - string:
+ name: GERRIT_REFSPEC
+ default: 'refs/heads/master'
+ description: 'git refSpec to build (refs/changes/)'
+
+ - string:
+ name: GERRIT_PROJECT
+ default: 'tost-onos'
+ description: 'Name of the project in Gerrit'
+
+ - string:
+ name: GERRIT_BRANCH
+ default: 'master'
+ description: 'Branch of the project in Gerrit'
+
+ - string:
+ name: dockerRepo
+ default: '{docker-repo}'
+ description: "Docker repository to push to ('onosproject', etc.)"
+
+ - string:
+ name: dockerRegistry
+ default: '{docker-registry}'
+ description: "Docker registry to push to (blank for DockerHub)"
+
+ # AWS CPU arch names: `x86_64` `arm64` (which don't align to vendor names... *sigh*)
+ - string:
+ name: dockerArchList
+ default: 'x86_64'
+ description: "List of architectures to build containers on, pipe separated (nonfunctional currently)"
+
+ - string:
+ name: maintainers
+ default: '{maintainers}'
+ description: "The person that should be notified if this job fails"
+
+ - string:
+ name: extraEnvironmentVars
+ default: '{extraEnvironmentVars}'
+ description: "Provide extra environment variables to the build"
+
+ - string:
+ name: buildDate
+ default: '{buildDate}'
+ description: "To add the build date to the tag"
+
+ project-type: pipeline
+ concurrent: true
+ extraEnvironmentVars: ""
+ sandbox: true
+ buildDate: 'true'
dsl: !include-raw-escape: ../pipeline/tost-onos-publish.groovy