Merge pull request #176 from berndtj/app-mgr-e2e

add application manager images to CI pipelines

Author: neosab

Makefile

@@ -86,7 +86,7 @@ darwin: ## build the server binary
 	GOOS=darwin go build -o bin/api-manager-darwin ./cmd/api-manager
 	GOOS=darwin go build -o bin/event-manager-darwin ./cmd/event-manager
 	GOOS=darwin go build -o bin/event-driver-darwin ./cmd/event-driver
-	GOOS=darwin go build -o bin/application-manager-linux ./cmd/application-manager
+	GOOS=darwin go build -o bin/application-manager-darwin ./cmd/application-manager
 	GOOS=darwin go build -o bin/dispatch-darwin ./cmd/dispatch
 
 cli-darwin:

ci/e2e/collect-logs.yml

@@ -54,6 +54,7 @@ run:
     kubectl logs deploy/dispatch-secret-store -n ${DISPATCH_NAMESPACE} | sed 's/\\n/\n/g' > dispatch-secret-store.log 2>&1
     kubectl logs deploy/dispatch-event-manager -n ${DISPATCH_NAMESPACE} | sed 's/\\n/\n/g' > dispatch-event-manager.log 2>&1
     kubectl logs deploy/dispatch-api-manager -n ${DISPATCH_NAMESPACE} | sed 's/\\n/\n/g' > dispatch-api-manager.log 2>&1
+    kubectl logs deploy/dispatch-application-manager -n ${DISPATCH_NAMESPACE} | sed 's/\\n/\n/g' > dispatch-application-manager.log 2>&1
 
     # Postgres logs
     kubectl logs deploy/${POSTGRES_NAME}-postgresql -n ${DISPATCH_NAMESPACE} | sed 's/\\n/\n/g' > ${POSTGRES_NAME}-postgresql.log 2>&1

ci/pipelines/e2e.yml

@@ -37,58 +37,66 @@ resources:
 - name: api-manager-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-api-manager
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-api-manager
 
 - name: event-driver-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-event-driver
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-event-driver
 
 - name: event-manager-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-event-manager
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-event-manager
 
 - name: function-manager-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-function-manager
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-function-manager
 
 - name: identity-manager-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-identity-manager
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-identity-manager
 
 - name: image-manager-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-image-manager
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-image-manager
 
 - name: secret-store-image
   type: docker-image
   source:
-    email: ((docker-hub-email))
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    repository: ((docker-hub-org))/dispatch-secret-store
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-secret-store
+
+- name: application-manager-image
+  type: docker-image
+  source:
+    email: ((artifactory-email))
+    username: ((artifactory-username))
+    password: ((artifactory-password))
+    repository: ((artifactory-org))/dispatch-application-manager
 
 - name: k8s-clusters
   type: pool
@@ -155,6 +163,11 @@ jobs:
         build: build-context
         dockerfile: build-context/secret-store/Dockerfile
         tag: build-context/tag
+    - put: application-manager-image
+      params:
+        build: build-context
+        dockerfile: build-context/application-manager/Dockerfile
+        tag: build-context/tag
 
 - name: deploy-and-run-tests
   public: true

ci/pipelines/release.yml

@@ -56,6 +56,14 @@ resources:
     password: ((docker-hub-password))
     repository: ((docker-hub-org))/dispatch-secret-store
 
+- name: application-manager-release
+  type: docker-image
+  source:
+    email: ((docker-hub-email))
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
+    repository: ((docker-hub-org))/dispatch-application-manager
+
 - name: dispatch-master
   type: git
   source:
@@ -156,6 +164,11 @@ jobs:
           build: build-context
           dockerfile: build-context/secret-store/Dockerfile
           tag: build-context/tag
+      - put: application-manager-release
+        params:
+          build: build-context
+          dockerfile: build-context/application-manager/Dockerfile
+          tag: build-context/tag
     - task: push-charts
       file: dispatch/ci/release/push-charts.yml
       params: