diff options
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/ncomp/ncomp-maven.yaml | 21 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 23 |
3 files changed, 22 insertions, 24 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index e11a658a9..af595b3b9 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -307,7 +307,7 @@ - job-template: name: '{project-name}-{stream}-docker-java-daily' project-type: freestyle - node: 'centos7-docker-8c-8g' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml new file mode 100644 index 000000000..9a1d2ad62 --- /dev/null +++ b/jjb/ncomp/ncomp-maven.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: ncomp-maven + project-name: 'ncomp-maven' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'ncomp/maven' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ncomp-settings' + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 99e7460cf..ca79868aa 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -115,29 +115,6 @@ Dpkg::Options { EOF - # Wrap apt-get to wait for the lock to become available for operation - # http://askubuntu.com/questions/132059/how-to-make-a-package-manager-wait-if-another-instance-of-apt-is-running - cat << 'EOF' >> /usr/local/bin/apt-get -#!/bin/bash - -i=0 -tput sc -while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - case $(($i % 4)) in - 0 ) j="-" ;; - 1 ) j="\\" ;; - 2 ) j="|" ;; - 3 ) j="/" ;; - esac - tput rc - echo -en "\r[$j] Waiting for other software managers to finish..." - sleep 0.5 - ((i=i+1)) -done - -/usr/bin/apt-get "$@" - -EOF chmod +x /usr/local/bin/apt-get echo "---> Updating operating system" |