Merge pull request openshift#16907 from ianzhang366/ocm-add-applifecy…

…cle-backend-e2e ggadding fast-forward and sonar jobs
cgwalters · Mar 17, 2021 · 5af6eee · 5af6eee
2 parents d891dfb + 71e9e67
commit 5af6eee
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 1 deletion.
diff --git a/...ement/applifecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main.yaml b/...ement/applifecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main.yaml
@@ -17,8 +17,8 @@ images:
   from: base
   to: applifecycle-backend-e2e
 promotion:
+  name: "2.3"
   namespace: open-cluster-management
-  tag: latest
 resources:
   '*':
     requests:
@@ -37,6 +37,15 @@ tests:
     set +o pipefail
   container:
     from: src
+- as: sonar
+  commands: |
+    export SELF="make -f Makefile.prow"
+    make -f Makefile.prow sonar/go/prow
+  container:
+    from: src
+  secrets:
+  - mount_path: /etc/sonarcloud/
+    name: acm-sonarcloud-token
 zz_generated_metadata:
   branch: main
   org: open-cluster-management

diff --git a/...pplifecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-release-2.3.yaml b/...pplifecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-release-2.3.yaml
@@ -17,6 +17,7 @@ images:
   from: base
   to: applifecycle-backend-e2e
 promotion:
+  disabled: true
   name: "2.3"
   namespace: open-cluster-management
 resources:

diff --git a/...ecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main-postsubmits.yaml b/...ecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main-postsubmits.yaml
@@ -1,5 +1,43 @@
 postsubmits:
   open-cluster-management/applifecycle-backend-e2e:
+  - agent: kubernetes
+    branches:
+    - ^main$
+    cluster: build02
+    decorate: true
+    extra_refs:
+    - base_ref: master
+      org: openshift
+      repo: release
+    name: branch-ci-open-cluster-management-applifecycle-backend-e2e-main-fast-forward
+    spec:
+      containers:
+      - args:
+        - --config-dir=../../openshift/release/ci-operator/config/open-cluster-management/applifecycle-backend-e2e/
+        - --current-release=2.3
+        - --current-promotion-namespace=open-cluster-management
+        - --future-release=2.3
+        - --fast-forward
+        - --confirm
+        - --username=acm-cicd
+        - --token-path=/etc/github/token
+        command:
+        - repo-brancher
+        image: repo-brancher:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/github
+          name: acm-cicd-github
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: acm-cicd-github
+        secret:
+          secretName: acm-cicd-github
   - agent: kubernetes
     branches:
     - ^main$
@@ -53,3 +91,40 @@ postsubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
+  - agent: kubernetes
+    branches:
+    - ^main$
+    cluster: build02
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: branch-ci-open-cluster-management-applifecycle-backend-e2e-main-sonar
+    spec:
+      containers:
+      - args:
+        - -f
+        - Makefile.prow
+        - sonar/go/prow
+        command:
+        - make
+        env:
+        - name: ARTIFACT_DIR
+          value: $(ARTIFACTS)
+        - name: SELF
+          value: make -f Makefile.prow
+        image: registry.ci.openshift.org/open-cluster-management/builder:go1.15-linux-amd64
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
+        volumeMounts:
+        - mountPath: /etc/sonarcloud
+          name: acm-sonarcloud-token
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: acm-sonarcloud-token
+        secret:
+          secretName: acm-sonarcloud-token
diff --git a/...fecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main-presubmits.yaml b/...fecycle-backend-e2e/open-cluster-management-applifecycle-backend-e2e-main-presubmits.yaml
@@ -48,6 +48,61 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - main
+    cluster: build01
+    context: ci/prow/sonar
+    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-open-cluster-management-applifecycle-backend-e2e-main-sonar
+    rerun_command: /test sonar
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/acm-sonarcloud-token
+        - --target=sonar
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/acm-sonarcloud-token
+          name: acm-sonarcloud-token
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: acm-sonarcloud-token
+        secret:
+          secretName: acm-sonarcloud-token
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )sonar,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

diff --git a/...backend-e2e/open-cluster-management-applifecycle-backend-e2e-release-2.3-postsubmits.yaml b/...backend-e2e/open-cluster-management-applifecycle-backend-e2e-release-2.3-postsubmits.yaml
@@ -1,5 +1,48 @@
 postsubmits:
   open-cluster-management/applifecycle-backend-e2e:
+  - agent: kubernetes
+    branches:
+    - ^release-2\.3$
+    cluster: build02
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: branch-ci-open-cluster-management-applifecycle-backend-e2e-main-publish
+    spec:
+      containers:
+      - args:
+        - -f
+        - Makefile.prow
+        - osci/publish
+        command:
+        - make
+        env:
+        - name: COMPONENT_NAME
+          value: applifecycle-backend-e2e
+        - name: COMPONENT_VERSION
+          value: 2.3.0
+        - name: OSCI_IMAGE_REMOTE_REPO_SRC
+          value: registry.ci.openshift.org/open-cluster-management
+        - name: OSCI_PUBLISH_DELAY
+          value: "10"
+        - name: SELF
+          value: make -f Makefile.prow
+        image: registry.ci.openshift.org/open-cluster-management/builder:go1.16-linux-amd64
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
+        volumeMounts:
+        - mountPath: /etc/github
+          name: acm-cicd-github
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: acm-cicd-github
+        secret:
+          secretName: acm-cicd-github
   - agent: kubernetes
     branches:
     - ^release-2\.3$
@@ -53,3 +96,40 @@ postsubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
+  - agent: kubernetes
+    branches:
+    - ^release-2\.3$
+    cluster: build02
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: branch-ci-open-cluster-management-applifecycle-backend-e2e-release-2.3-sonar
+    spec:
+      containers:
+      - args:
+        - -f
+        - Makefile.prow
+        - sonar/go/prow
+        command:
+        - make
+        env:
+        - name: ARTIFACT_DIR
+          value: $(ARTIFACTS)
+        - name: SELF
+          value: make -f Makefile.prow
+        image: registry.ci.openshift.org/open-cluster-management/builder:go1.16-linux-amd64
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
+        volumeMounts:
+        - mountPath: /etc/sonarcloud
+          name: acm-sonarcloud-token
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: acm-sonarcloud-token
+        secret:
+          secretName: acm-sonarcloud-token