From 1c01122ec24aabc58ffb311865b88d9a797b386f Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Mon, 19 Aug 2019 15:44:41 -0600
Subject: [PATCH] logging - simple upgrade job

---
 ...hift-origin-aggregated-logging-master.yaml |  7 ++
 ...-aggregated-logging-master-presubmits.yaml | 68 +++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml
index 6ff3a5505ca3d..3c2b56bdb72c2 100644
--- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml
+++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml
@@ -85,3 +85,10 @@ tests:
     . openshift/ci-operator/build-image/setup-logging-for-e2e.sh
   openshift_installer_src:
     cluster_profile: aws
+- as: upgrade-full-integ-aws
+  commands: |
+    OPENSHIFT_BUILD_NAMESPACE= IMAGE_FORMAT= USE_CUSTOM_IMAGES=true hack/deploy-logging.sh
+    export LOGGING_DEPLOY_MODE=upgrade
+    . openshift/ci-operator/build-image/setup-logging-for-e2e.sh
+  openshift_installer_src:
+    cluster_profile: aws
diff --git a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master-presubmits.yaml b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master-presubmits.yaml
index b6270504ce2ed..2d8608377456e 100644
--- a/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master-presubmits.yaml
@@ -221,3 +221,71 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/upgrade-full-integ-aws
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-origin-aggregated-logging-master-upgrade-full-integ-aws
+    rerun_command: /test upgrade-full-integ-aws
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/upgrade-full-integ-aws-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=upgrade-full-integ-aws
+        - --template=/usr/local/upgrade-full-integ-aws
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-origin-aggregated-logging-master.yaml
+              name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: upgrade-full-integ-aws
+        - name: TEST_COMMAND
+          value: |
+            OPENSHIFT_BUILD_NAMESPACE= IMAGE_FORMAT= USE_CUSTOM_IMAGES=true hack/deploy-logging.sh
+            export LOGGING_DEPLOY_MODE=upgrade
+            . openshift/ci-operator/build-image/setup-logging-for-e2e.sh
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/upgrade-full-integ-aws-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/upgrade-full-integ-aws
+          name: job-definition
+          subPath: cluster-launch-installer-src.yaml
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - configMap:
+          name: prow-job-cluster-launch-installer-src
+        name: job-definition
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )upgrade-full-integ-aws,?($|\s.*)