diff options
| -rwxr-xr-x | jjb/aaf/build-sshsm-docker-images.sh | 8 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 15 | ||||
| -rw-r--r-- | packer/provision/local-docker.yaml | 8 |
3 files changed, 13 insertions, 18 deletions
diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh index 7ed071987..b0c888231 100755 --- a/jjb/aaf/build-sshsm-docker-images.sh +++ b/jjb/aaf/build-sshsm-docker-images.sh @@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -echo 'Building AAF/sshsm base containers' -cd bin/base -chmod 755 build_base_images.sh -./build_base_images.sh +echo 'Building AAF/sshsm containers' +cd bin +chmod 755 build_images.sh +./build_images.sh diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index c6929bb98..2508076de 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -12,7 +12,7 @@ files: '**' maven-deploy-properties: | deployAtEnd=true - archive-artifacts: '' + archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html' build-node: ubuntu1604-docker-8c-8g jobs: - gerrit-maven-clm @@ -26,16 +26,3 @@ # No-op script: '/bin/true' -- project: - name: dcaegen2-collectors-hv-ves-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/collectors/hv-ves' - project-name: 'dcaegen2-collectors-hv-ves' - branch: 'master' - mvn-settings: 'dcaegen2-collectors-hv-ves-settings' - mvn-goals: 'clean install' - mvn-params: '-DskipDocker' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index e452b7057..1825caa3a 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -154,3 +154,11 @@ file: path: /tmp/rebar3 state: absent + + - name: Download geckodriver + unarchive: + src: https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz + dest: /usr/bin + mode: 0644 + remote_src: yes + become: true |