cleanup and try backend build

bcgov · Mar 15, 2024 · 3d24ecb · 3d24ecb
1 parent c8a6b6a
commit 3d24ecb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 289 deletions.
diff --git a/.github/workflows/dev-ci.yaml b/.github/workflows/dev-ci.yaml
@@ -4,7 +4,7 @@ name: CTHUB 0.2.0 Dev CI
 
 on:
   push:
-    branches: [ release-0.2.0 ]
+    branches: [ backend-build-0.2.0 ]
     paths:
       - frontend/**
       - backend/**
@@ -57,13 +57,13 @@ jobs:
           insecure_skip_tls_verify: true
           namespace: ${{ env.TOOLS_NAMESPACE }}
 
-      # - name: Build CTHUB Backend
-      #   run: |
-      #     cd openshift/templates/backend
-      #     oc process -f ./backend-bc.yaml NAME=cthub SUFFIX=-${{ env.VERSION }}-${{ env.PRE_RELEASE }} VERSION=${{ env.VERSION }}-${{ env.PRE_RELEASE }} GIT_URL=${{ env.GIT_URL }} GIT_REF=release-${{ env.VERSION }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
-      #     sleep 5s
-      #     oc -n ${{ env.TOOLS_NAMESPACE }} wait --for=condition=Complete --timeout=900s build/cthub-backend-${{ env.VERSION }}-${{ env.PRE_RELEASE }}-1
-      #     oc tag ${{ env.TOOLS_NAMESPACE }}/cthub-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }} ${{ env.DEV_NAMESPACE }}/cthub-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }}
+      - name: Build CTHUB Backend
+        run: |
+          cd openshift/templates/backend
+          oc process -f ./backend-bc.yaml NAME=cthub SUFFIX=-${{ env.VERSION }}-${{ env.PRE_RELEASE }} VERSION=${{ env.VERSION }}-${{ env.PRE_RELEASE }} GIT_URL=${{ env.GIT_URL }} GIT_REF=release-${{ env.VERSION }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
+          sleep 5s
+          oc -n ${{ env.TOOLS_NAMESPACE }} wait --for=condition=Complete --timeout=900s build/cthub-backend-${{ env.VERSION }}-${{ env.PRE_RELEASE }}-1
+          oc tag ${{ env.TOOLS_NAMESPACE }}/cthub-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }} ${{ env.DEV_NAMESPACE }}/cthub-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }}
 
       - name: Build CTHUB Frontend
         run: |

diff --git a/django/.s2i/bin/assemble b/django/.s2i/bin/assemble
diff --git a/django/.s2i/environment b/django/.s2i/environment
diff --git a/openshift/templates/backend/backend-bc.yaml b/openshift/templates/backend/backend-bc.yaml
@@ -25,20 +25,6 @@ parameters:
     description: cthub branch name of the pr
     required: true
 objects:
-  - apiVersion: image.openshift.io/v1
-    kind: ImageStream
-    metadata:
-      annotations:
-        description: Keeps track of changes in the backend image
-      creationTimestamp: null
-      name: ${NAME}-python
-      labels:
-        shared: "true"      
-    spec:
-      lookupPolicy:
-        local: false
-    status:
-      dockerImageRepository: ""
   - apiVersion: image.openshift.io/v1
     kind: ImageStream
     metadata:
@@ -100,7 +86,7 @@ objects:
               value: 'true'
           from:
             kind: ImageStreamTag
-            name: python-39:1-18.1634036280
+            name: python-311:1-52
           forcePull: true
           noCache: true            
         type: Source

diff --git a/react/.s2i/bin/assemble b/react/.s2i/bin/assemble