summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-templates-java.yaml13
-rw-r--r--jjb/mso/mso.yaml7
2 files changed, 1 insertions, 19 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index ca18d035d..8499e61b3 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -324,18 +324,6 @@
refspec: ''
choosing-strategy: 'default'
- - git-extra-project:
- refspec: 'refs/heads/{extra-branch}'
- project: '{extra-project}'
- branch: '{extra-branch}'
- checkout-dir: '{extra-checkout-dir}'
-
- - git-extra-project:
- refspec: 'refs/heads/{extra-branch-2}'
- project: '{extra-project-2}'
- branch: '{extra-branch-2}'
- checkout-dir: '{extra-checkout-dir-2}'
-
wrappers:
- ecomp-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -348,6 +336,7 @@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
+
- maven-docker-push-daily:
profile-name: '{profile-name}'
mvn-settings: '{mvn-settings}'
diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index 126015930..0c176561a 100644
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -8,13 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-docker-java-daily':
- extra-project: 'mso/chef-repo'
- extra-branch: 'master'
- extra-checkout-dir: './packages/docker/src/main/docker/docker-files/chef-config/chef-repos'
- extra-project-2: 'mso/mso-config'
- extra-branch-2: 'master'
- extra-checkout-dir-2: './packages/docker/src/main/docker/docker-files/chef-config/mso-config'
-
docker-pom: './packages/docker/pom.xml'
profile-name: 'docker'