Update tost-onos ci/cd jobs
- Removes unused variables
- Leverages the new onf-infra-onfstaff-private property
Change-Id: I373f08d6544da1f7bf51a3d4f01bbda9e94b444e
diff --git a/jjb/repos/tost-onos.yaml b/jjb/repos/tost-onos.yaml
index 981fdbe..b581054 100644
--- a/jjb/repos/tost-onos.yaml
+++ b/jjb/repos/tost-onos.yaml
@@ -20,8 +20,6 @@
- 'tag-check':
dependency-jobs: 'license-check_tost-onos'
- 'private-make-test':
- make-test-vars: |-
- ONOS_BRANCH=onos-2.2
make-test-targets: 'docker-build'
junit-allow-empty-results: true
build-node: '{bigger-build-node}'
@@ -35,6 +33,4 @@
docker-registry: 'registry.aetherproject.org'
maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
build-timeout: 30
- extraEnvironmentVars: >-
- ONOS_BRANCH=onos-2.2
dependency-jobs: 'version-tag'
diff --git a/jjb/templates/private-docker-publish.yaml b/jjb/templates/private-docker-publish.yaml
index 54daf07..2e09d16 100644
--- a/jjb/templates/private-docker-publish.yaml
+++ b/jjb/templates/private-docker-publish.yaml
@@ -16,30 +16,7 @@
dependency-jobs: '{dependency-jobs}'
properties:
- - raw:
- xml: |
- <hudson.security.AuthorizationMatrixProperty>
- <inheritanceStrategy class="org.jenkinsci.plugins.matrixauth.inheritance.NonInheritingStrategy"/>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Create:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Delete:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.ManageDomains:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Update:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.View:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Build:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Cancel:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Configure:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Delete:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Discover:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Discover:ONFStaff</permission>
- <permission>hudson.model.Item.ExtendedRead:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Move:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Read:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Read:ONFStaff</permission>
- <permission>hudson.model.Item.Workspace:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Delete:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Replay:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Update:JenkinsPowerusers</permission>
- </hudson.security.AuthorizationMatrixProperty>
+ - onf-infra-onfstaff-private:
- onf-infra-properties:
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
diff --git a/jjb/templates/private-make-test.yaml b/jjb/templates/private-make-test.yaml
index 09b9ecd..f716bb8 100644
--- a/jjb/templates/private-make-test.yaml
+++ b/jjb/templates/private-make-test.yaml
@@ -19,30 +19,7 @@
file-include-regexp: '{all-files-regexp}'
properties:
- - raw:
- xml: |
- <hudson.security.AuthorizationMatrixProperty>
- <inheritanceStrategy class="org.jenkinsci.plugins.matrixauth.inheritance.NonInheritingStrategy"/>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Create:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Delete:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.ManageDomains:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Update:JenkinsPowerusers</permission>
- <permission>com.cloudbees.plugins.credentials.CredentialsProvider.View:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Build:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Cancel:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Configure:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Delete:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Discover:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Discover:ONFStaff</permission>
- <permission>hudson.model.Item.ExtendedRead:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Move:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Read:JenkinsPowerusers</permission>
- <permission>hudson.model.Item.Read:ONFStaff</permission>
- <permission>hudson.model.Item.Workspace:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Delete:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Replay:JenkinsPowerusers</permission>
- <permission>hudson.model.Run.Update:JenkinsPowerusers</permission>
- </hudson.security.AuthorizationMatrixProperty>
+ - onf-infra-onfstaff-private:
- onf-infra-properties:
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'