Update 'che-server' component (#39428)

* Update 'che-server' component * Fix up the test script name
openshift · May 19, 2023 · 8ee0dcf · 8ee0dcf
1 parent 4eceb0c
commit 8ee0dcf
Show file tree

Hide file tree

Showing 2 changed files with 227 additions and 27 deletions.
diff --git a/ci-operator/config/eclipse-che/che-server/eclipse-che-che-server-main__v12.yaml b/ci-operator/config/eclipse-che/che-server/eclipse-che-che-server-main__v12.yaml
@@ -19,39 +19,79 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: gitlab-flow
+- as: gitlab-no-pat-oauth-flow
   steps:
     cluster_profile: gcp
     test:
     - as: che-server-test
       cli: latest
-      commands: /bin/bash .ci/openshift-ci/test-gitlab-flow.sh
+      commands: /bin/bash .ci/openshift-ci/test-gitlab-no-pat-oauth-flow.sh
       from: src
       resources:
         requests:
           cpu: 100m
           memory: 200Mi
     workflow: ipi-gcp
-- as: bitbucket-flow
+- as: bitbucket-no-pat-oauth-flow
   steps:
     cluster_profile: gcp
     test:
     - as: che-server-test
       cli: latest
-      commands: /bin/bash .ci/openshift-ci/test-bitbucket-flow.sh
+      commands: /bin/bash .ci/openshift-ci/test-bitbucket-no-pat-oauth-flow.sh
       from: src
       resources:
         requests:
           cpu: 100m
           memory: 200Mi
     workflow: ipi-gcp
-- as: github-flow
+- as: github-no-pat-oauth-flow
   steps:
     cluster_profile: gcp
     test:
     - as: che-server-test
       cli: latest
-      commands: /bin/bash .ci/openshift-ci/test-github-flow.sh
+      commands: /bin/bash .ci/openshift-ci/test-github-no-pat-oauth-flow.sh
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: ipi-gcp
+- as: github-with-pat-setup-flow
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: che-server-test
+      cli: latest
+      commands: |
+        export GITHUB_USER_ID=$(cat /usr/local/ci-secrets/github/gh-user-id)
+        export GITHUB_PAT=$(cat /usr/local/ci-secrets/github/gh-pat)
+        /bin/bash .ci/openshift-ci/test-github-with-pat-setup-flow.sh
+      credentials:
+      - mount_path: /usr/local/ci-secrets/github
+        name: github
+        namespace: test-credentials
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: ipi-gcp
+- as: gitlab-with-pat-setup-flow
+  steps:
+    cluster_profile: gcp
+    test:
+    - as: che-server-test
+      cli: latest
+      commands: |
+        export GITLAB_USER_ID=$(cat /usr/local/ci-secrets/gitlab/gl-user-id)
+        export GITLAB_PAT=$(cat /usr/local/ci-secrets/gitlab/gl-pat)
+        /bin/bash .ci/openshift-ci/test-gitlab-with-pat-setup-flow.sh
+      credentials:
+      - mount_path: /usr/local/ci-secrets/gitlab
+        name: gitlab
+        namespace: test-credentials
       from: src
       resources:
         requests:

diff --git a/ci-operator/jobs/eclipse-che/che-server/eclipse-che-che-server-main-presubmits.yaml b/ci-operator/jobs/eclipse-che/che-server/eclipse-che-che-server-main-presubmits.yaml
@@ -6,7 +6,7 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build04
-    context: ci/prow/v12-bitbucket-flow
+    context: ci/prow/v12-bitbucket-no-pat-oauth-flow
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -16,8 +16,8 @@ presubmits:
       ci-operator.openshift.io/variant: v12
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-che-server-main-v12-bitbucket-flow
-    rerun_command: /test v12-bitbucket-flow
+    name: pull-ci-eclipse-che-che-server-main-v12-bitbucket-no-pat-oauth-flow
+    rerun_command: /test v12-bitbucket-no-pat-oauth-flow
     spec:
       containers:
       - args:
@@ -26,8 +26,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/bitbucket-flow-cluster-profile
-        - --target=bitbucket-flow
+        - --secret-dir=/usr/local/bitbucket-no-pat-oauth-flow-cluster-profile
+        - --target=bitbucket-no-pat-oauth-flow
         - --variant=v12
         command:
         - ci-operator
@@ -44,7 +44,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/bitbucket-flow-cluster-profile
+        - mountPath: /usr/local/bitbucket-no-pat-oauth-flow-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -79,14 +79,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v12-bitbucket-flow,?($|\s.*)
+    trigger: (?m)^/test( | .* )v12-bitbucket-no-pat-oauth-flow,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^main$
     - ^main-
     cluster: build04
-    context: ci/prow/v12-github-flow
+    context: ci/prow/v12-github-no-pat-oauth-flow
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -96,8 +96,8 @@ presubmits:
       ci-operator.openshift.io/variant: v12
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-che-server-main-v12-github-flow
-    rerun_command: /test v12-github-flow
+    name: pull-ci-eclipse-che-che-server-main-v12-github-no-pat-oauth-flow
+    rerun_command: /test v12-github-no-pat-oauth-flow
     spec:
       containers:
       - args:
@@ -106,8 +106,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/github-flow-cluster-profile
-        - --target=github-flow
+        - --secret-dir=/usr/local/github-no-pat-oauth-flow-cluster-profile
+        - --target=github-no-pat-oauth-flow
         - --variant=v12
         command:
         - ci-operator
@@ -124,7 +124,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/github-flow-cluster-profile
+        - mountPath: /usr/local/github-no-pat-oauth-flow-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -159,14 +159,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v12-github-flow,?($|\s.*)
+    trigger: (?m)^/test( | .* )v12-github-no-pat-oauth-flow,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - ^main$
     - ^main-
     cluster: build04
-    context: ci/prow/v12-gitlab-flow
+    context: ci/prow/v12-github-with-pat-setup-flow
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -176,8 +176,8 @@ presubmits:
       ci-operator.openshift.io/variant: v12
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-che-server-main-v12-gitlab-flow
-    rerun_command: /test v12-gitlab-flow
+    name: pull-ci-eclipse-che-che-server-main-v12-github-with-pat-setup-flow
+    rerun_command: /test v12-github-with-pat-setup-flow
     spec:
       containers:
       - args:
@@ -186,8 +186,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/gitlab-flow-cluster-profile
-        - --target=gitlab-flow
+        - --secret-dir=/usr/local/github-with-pat-setup-flow-cluster-profile
+        - --target=github-with-pat-setup-flow
         - --variant=v12
         command:
         - ci-operator
@@ -204,7 +204,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/gitlab-flow-cluster-profile
+        - mountPath: /usr/local/github-with-pat-setup-flow-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -239,4 +239,164 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v12-gitlab-flow,?($|\s.*)
+    trigger: (?m)^/test( | .* )v12-github-with-pat-setup-flow,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build04
+    context: ci/prow/v12-gitlab-no-pat-oauth-flow
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/variant: v12
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-eclipse-che-che-server-main-v12-gitlab-no-pat-oauth-flow
+    rerun_command: /test v12-gitlab-no-pat-oauth-flow
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/gitlab-no-pat-oauth-flow-cluster-profile
+        - --target=gitlab-no-pat-oauth-flow
+        - --variant=v12
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/gitlab-no-pat-oauth-flow-cluster-profile
+          name: cluster-profile
+        - 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: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v12-gitlab-no-pat-oauth-flow,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build04
+    context: ci/prow/v12-gitlab-with-pat-setup-flow
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci-operator.openshift.io/variant: v12
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-eclipse-che-che-server-main-v12-gitlab-with-pat-setup-flow
+    rerun_command: /test v12-gitlab-with-pat-setup-flow
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/gitlab-with-pat-setup-flow-cluster-profile
+        - --target=gitlab-with-pat-setup-flow
+        - --variant=v12
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/gitlab-with-pat-setup-flow-cluster-profile
+          name: cluster-profile
+        - 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: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-gcp
+          - configMap:
+              name: cluster-profile-gcp
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v12-gitlab-with-pat-setup-flow,?($|\s.*)