Merge "Install Chrome on docker images"
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 4bab946..7e007ec 100644
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -9,6 +9,9 @@
- '{project-name}-{stream}-verify-c':
script:
!include-raw-escape: 'build-sshsm.sh'
+ - '{project-name}-{stream}-docker-c-shell-daily':
+ script:
+ !include-raw-escape: 'build-sshsm-docker-images.sh'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh
new file mode 100755
index 0000000..b70c13d
--- /dev/null
+++ b/jjb/aaf/build-sshsm-docker-images.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+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
+sh build_base_images.sh
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index eccf2e1..81dc8f4 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -29,8 +29,6 @@
jobs:
- 'docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- - 'docker-version-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
project: 'appc/deployment'
stream:
- 'master':
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index fc89511..764b0a0 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -49,3 +49,56 @@
publishers:
- infra-shiplogs:
maven-version: '{maven-version}'
+
+
+- job-template:
+ # Job template for building & pushing docker images
+ #
+ # The purpose of this job template is to run:
+ # 1. login to the docker registry
+ # 2. run a specified shell builder
+ #
+
+ name: '{project-name}-{stream}-docker-c-shell-daily'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+ disabled: false
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 12 AM UTC
+ - timed: 'H 12 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+ - docker-login
+ - shell: '{script}'
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'