From 272f488d2316e0c88b8a182d1e86557e483a3944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 26 Sep 2022 14:49:37 +0200 Subject: [PATCH] qa-landing: Move the project under the blockerbugs app --- playbooks/openshift-apps/blockerbugs.yml | 9 +++++ playbooks/openshift-apps/oraculum.yml | 9 ----- .../blockerbugs/files/service.yml | 18 ++++++++- .../blockerbugs/templates/buildconfig.yml | 33 +++++++++++++++ .../templates/deploymentconfig.yml | 40 ++++++++++++++++++- .../blockerbugs/templates/imagestream.yml | 15 +++++++ .../openshift-apps/oraculum/files/service.yml | 16 -------- .../oraculum/templates/buildconfig.yml | 33 --------------- .../oraculum/templates/deploymentconfig.yml | 38 ------------------ .../oraculum/templates/imagestream.yml | 16 -------- 10 files changed, 113 insertions(+), 114 deletions(-) diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index 71b11eeb40..3ca4c4ab9d 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -93,6 +93,15 @@ serviceport: 8080-tcp servicename: blockerbugs + - role: openshift/route + app: blockerbugs + routename: qa-landing + host: "qa{{ env_suffix }}.fedoraproject.org" + serviceport: 8080-tcp + servicename: qa-landing + annotations: + haproxy.router.openshift.io/set-forwarded-headers: append + - role: openshift/start-build app: blockerbugs buildname: blockerbugs-build diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index 85897697fe..e0fdafc2ee 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -120,15 +120,6 @@ annotations: haproxy.router.openshift.io/set-forwarded-headers: append - - role: openshift/route - app: oraculum - routename: qa-landing - host: "qa{{ env_suffix }}.fedoraproject.org" - serviceport: 8080-tcp - servicename: qa-landing - annotations: - haproxy.router.openshift.io/set-forwarded-headers: append - - role: openshift/start-build app: oraculum buildname: packager-dashboard-build diff --git a/roles/openshift-apps/blockerbugs/files/service.yml b/roles/openshift-apps/blockerbugs/files/service.yml index e33654de16..63023f6901 100644 --- a/roles/openshift-apps/blockerbugs/files/service.yml +++ b/roles/openshift-apps/blockerbugs/files/service.yml @@ -13,4 +13,20 @@ spec: targetPort: 8080 selector: app: blockerbugs - deploymentconfig: blockerbugs \ No newline at end of file + deploymentconfig: blockerbugs +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: blockerbugs + name: qa-landing +spec: + ports: + - name: 8080-tcp + port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: blockerbugs + deploymentconfig: qa-landing diff --git a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml index 6aef01673a..26b25e22ff 100644 --- a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml +++ b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml @@ -27,4 +27,37 @@ spec: name: registry.access.redhat.com/ubi8/python-39 triggers: - type: ConfigChange + - type: ImageChange + --- +apiVersion: v1 +kind: BuildConfig +metadata: + name: qa-landing-page-build + labels: + environment: "blockerbugs" +spec: + output: + to: + kind: ImageStreamTag + name: qa-landing:latest + source: + type: Git + git: + uri: 'https://pagure.io/fedora-qa/landingpage.git' +{% if env == 'staging' %} + ref: 'master' +{% else %} + ref: 'master' +{% endif %} + strategy: + type: Docker + dockerStrategy: + dockerfilePath: Dockerfile + env: + - name: "SUBDIR" + value: "/" + - name: "API" + value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/" + triggers: + - type: ConfigChange - type: ImageChange \ No newline at end of file diff --git a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml index c96fa656fd..3d6847ca6f 100644 --- a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml +++ b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml @@ -112,4 +112,42 @@ spec: - blockerbugs from: kind: ImageStreamTag - name: blockerbugs:latest \ No newline at end of file + name: blockerbugs:latest +--- +apiVersion: v1 +kind: DeploymentConfig +metadata: + labels: + app: blockerbugs + service: qa-landing + name: qa-landing +spec: + replicas: 1 # Never change this to more or less than ONE! + selector: + app: blockerbugs + deploymentconfig: blockerbugs + template: + metadata: + labels: + app: blockerbugs + deploymentconfig: blockerbugs + spec: + containers: + - name: qa-landing + image: qa-landing:latest + resources: {} + env: + - name: SUBDIR + value: "/" + - name: API + value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/" + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - qa-landing + from: + kind: ImageStreamTag + name: qa-landing:latest \ No newline at end of file diff --git a/roles/openshift-apps/blockerbugs/templates/imagestream.yml b/roles/openshift-apps/blockerbugs/templates/imagestream.yml index fc811483df..e0c046c46b 100644 --- a/roles/openshift-apps/blockerbugs/templates/imagestream.yml +++ b/roles/openshift-apps/blockerbugs/templates/imagestream.yml @@ -6,5 +6,20 @@ metadata: spec: lookupPolicy: local: false +status: + dockerImageRepository: "" +--- +apiVersion: v1 +kind: ImageStream +metadata: + name: qa-landing +spec: + lookupPolicy: + local: false + tags: + - name: latest + from: + kind: ImageStreamTag + name: qa-landing status: dockerImageRepository: "" \ No newline at end of file diff --git a/roles/openshift-apps/oraculum/files/service.yml b/roles/openshift-apps/oraculum/files/service.yml index 73500d9107..d9d1e9312f 100644 --- a/roles/openshift-apps/oraculum/files/service.yml +++ b/roles/openshift-apps/oraculum/files/service.yml @@ -62,19 +62,3 @@ spec: selector: app: oraculum deploymentconfig: oraculum-frontend ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: oraculum - name: qa-landing -spec: - ports: - - name: 8080-tcp - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: oraculum - deploymentconfig: qa-landing diff --git a/roles/openshift-apps/oraculum/templates/buildconfig.yml b/roles/openshift-apps/oraculum/templates/buildconfig.yml index 23d1280b04..45674da970 100644 --- a/roles/openshift-apps/oraculum/templates/buildconfig.yml +++ b/roles/openshift-apps/oraculum/templates/buildconfig.yml @@ -59,36 +59,3 @@ spec: triggers: - type: ConfigChange - type: ImageChange ---- -apiVersion: v1 -kind: BuildConfig -metadata: - name: qa-landing-page-build - labels: - environment: "packager-dashboard" -spec: - output: - to: - kind: ImageStreamTag - name: qa-landing:latest - source: - type: Git - git: - uri: 'https://pagure.io/fedora-qa/landingpage.git' -{% if env == 'staging' %} - ref: 'master' -{% else %} - ref: 'master' -{% endif %} - strategy: - type: Docker - dockerStrategy: - dockerfilePath: Dockerfile - env: - - name: "SUBDIR" - value: "/" - - name: "API" - value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/" - triggers: - - type: ConfigChange - - type: ImageChange diff --git a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml index dc5407c541..34493318c0 100644 --- a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml +++ b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml @@ -430,41 +430,3 @@ spec: from: kind: ImageStreamTag name: oraculum-frontend:latest ---- -apiVersion: v1 -kind: DeploymentConfig -metadata: - labels: - app: oraculum - service: qa-landing - name: qa-landing -spec: - replicas: 1 # Never change this to more or less than ONE! - selector: - app: oraculum - deploymentconfig: qa-landing - template: - metadata: - labels: - app: oraculum - deploymentconfig: qa-landing - spec: - containers: - - name: qa-landing - image: qa-landing:latest - resources: {} - env: - - name: SUBDIR - value: "/" - - name: API - value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/" - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - qa-landing - from: - kind: ImageStreamTag - name: qa-landing:latest diff --git a/roles/openshift-apps/oraculum/templates/imagestream.yml b/roles/openshift-apps/oraculum/templates/imagestream.yml index fa5692d617..b887471a1a 100644 --- a/roles/openshift-apps/oraculum/templates/imagestream.yml +++ b/roles/openshift-apps/oraculum/templates/imagestream.yml @@ -45,19 +45,3 @@ spec: from: kind: DockerImage name: quay.io/fzatlouk/packager-dashboard:latest ---- -apiVersion: v1 -kind: ImageStream -metadata: - name: qa-landing -spec: - lookupPolicy: - local: false - tags: - - name: latest - from: - kind: ImageStreamTag - name: qa-landing -status: - dockerImageRepository: "" ----