barkbay

node {
    try {
        def builder = 'builder'
        def runtime = 'runtime'
        
        def imageStreamName = 'runtime'
        def imageStreamtag = 'latest'
        def dcName = 'js2i-demo-test'
        def containerNameInDC = 'js2i-demo'
        

barkbay

node {
    def imageStreamName = 'runtime'
    def imageStreamtag = 'latest'
    def dcName = 'js2i-demo-test'
    def containerNameInDC = 'js2i-demo'
    stage('Check image reference') {
        openshift.withCluster() {
            // Get exact reference for current tagged image
            def taggedImageReference = openshift.selector('istag',"${imageStreamName}:${imageStreamtag}").object().image.dockerImageReference.toString().trim()
            echo "Image reference in ImageStream is ${taggedImageReference}"

barkbay

Only in fluent/configs.d/dynamic: es-copy-config.conf
Only in fluent/configs.d/dynamic: es-ops-copy-config.conf
diff -r fluent/configs.d/dynamic/input-docker-default-docker.conf fluent.3.7.ok/configs.d/dynamic/input-docker-default-docker.conf
4,5c4,5
<   path /var/log/containers/*.log
<   pos_file /var/log/es-containers.log.pos
---
>   path "/var/log/containers/*.log"
>   pos_file "/var/log/es-containers.log.pos"
10c10

barkbay

#!/bin/bash

# Move CentOS Vms managed with VirtualBox from DHCP to static addresses

set -e
set -o pipefail

if [ ! -f ./terraform.tfstate ]; then
    echo "./terraform.tfstate file not found !"
    echo "Did you run 'terraform apply' or are you in the right directory ?"

barkbay

node {
   stage('Fetch current deployment') {
      currentDc = sh(returnStdout: true, script: 'oc get dc/openjdk-app --template="{{.status.latestVersion}}" -o template').trim()
      println currentDc
   }
   stage('Trigger new deployment') {
      def bar = openshiftDeploy apiURL: 'https://kubernetes.default:443', authToken: 'xxxxxxxxxxxx', depCfg: 'openjdk-app', namespace: 'plop', verbose: 'false', waitTime: '', waitUnit: 'sec'
      println bar
   }
   stage('Verify new deployment') {

barkbay

#!/bin/bash
set -uo pipefail

# Following variables must be set :
# OPENSHIFT_SERVER" : full url to the Openshift server, e.g. : https://192.168.42.67:8443"
# DOCKER_USER : the docker user used to login, with Openshift should be a Service Account registry-backup
# TOKEN : the token of the  Service Account
# DOCKER_HOST : the host where the Docker registry is deployed, WITHOUT http/https, e.g. : registry.192.168.42.67.xip.io:80
# DOCKER_SCHEMA : how to call remote registry http or https ?
# ERR_LOG : where to log errors, e.g. : /var/www/html/registry_backup_error.log

barkbay

#!/bin/bash
set -uo pipefail

# Following variables must be set :
# OPENSHIFT_SERVER" : full url to the Openshift server, e.g. : https://192.168.42.67:8443"
# DOCKER_USER : the docker user used to login, with Openshift should be a Service Account name
# TOKEN : the token of the  Service Account
# DOCKER_HOST : the host where the Docker registry is deployed, WITHOUT http/https, e.g. : registry.192.168.42.67.xip.io:80
# DOCKER_SCHEMA : how to call remote registry http or https ?
# ERR_LOG : where to log errors, e.g. : /var/www/html/registry_backup_error.log

barkbay

diff -uNr origin-git-9996.ef1caba/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/api/types.go origin-git-9996.ef1caba.mmo/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/api/types.go
--- origin-git-9996.ef1caba/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/api/types.go	2016-04-05 04:12:00.000000000 +0200
+++ origin-git-9996.ef1caba.mmo/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/api/types.go	2016-04-12 11:36:17.999070867 +0200
@@ -5,83 +5,6 @@
 	pconfig "k8s.io/kubernetes/pkg/proxy/config"
 )
 
-type EventType string
-
-const (

barkbay

diff -uNr origin-git-9996.ef1caba/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/registry.go origin-git-9996.ef1caba.mmo/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/registry.go
--- origin-git-9996.ef1caba/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/registry.go	2016-04-05 04:12:00.000000000 +0200
+++ origin-git-9996.ef1caba.mmo/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/registry.go	2016-04-10 12:38:00.326600181 +0200
@@ -32,7 +32,7 @@
 type Registry struct {
 	oClient          osclient.Interface
 	kClient          kclient.Interface
-	namespaceOfPodIP map[string]string
+	podsByIP         map[string]*kapi.Pod
 	serviceNetwork   *net.IPNet

barkbay

--- origin-git-7334.2c6ff4b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-ovs-multitenant 2015-12-03 21:21:31.000000000 +0100
+++ origin-git-7334.2c6ff4b-table6patched/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-ovs-multitenant   2015-12-23 10:24:49.970296462 +0100
@@ -58,7 +58,8 @@
     if [ "${tenant_id}" == "0" ]; then
       ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=150,ip,nw_dst=${ipaddr},actions=output:${ovs_port}"
     else
-      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=100,ip,nw_dst=${ipaddr},reg0=${tenant_id},actions=output:${ovs_port}"
+      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=200,ip,nw_dst=${ipaddr},reg0=0,actions=output:${ovs_port}"
+      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=200,ip,nw_dst=${ipaddr},reg0=${tenant_id},actions=output:${ovs_port}"
     fi