qa-landing: Move the project under the blockerbugs app

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

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

roles/openshift-apps/blockerbugs/files/service.yml

@@ -13,4 +13,20 @@ spec:
     targetPort: 8080
   selector:
     app: blockerbugs
-    deploymentconfig: blockerbugs
+    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

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

roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml

@@ -112,4 +112,42 @@ spec:
       - blockerbugs
       from:
         kind: ImageStreamTag
-        name: blockerbugs:latest
+        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

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: ""

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

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

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

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: ""
----