diff --git a/.github/workflows/jan-2025-dev-release.yaml b/.github/workflows/jan-2025-dev-release.yaml index b597a0080..63e984d84 100644 --- a/.github/workflows/jan-2025-dev-release.yaml +++ b/.github/workflows/jan-2025-dev-release.yaml @@ -32,47 +32,12 @@ jobs: run: | echo "VERSION=jan-2025" >> $GITHUB_OUTPUT - build-backend: - name: Build tfrs Backend - runs-on: ubuntu-latest - timeout-minutes: 60 - needs: [get-version] - - env: - BUILD_SUFFIX: ${{ needs.get-version.outputs.VERSION }} - - steps: - - name: Check out repository - uses: actions/checkout@v4.1.1 - with: - ref: ${{ env.GIT_REF }} - - - name: Log in to Openshift - uses: redhat-actions/oc-login@v1.3 - with: - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} - openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} - insecure_skip_tls_verify: true - namespace: ${{ env.TOOLS_NAMESPACE }} - - - name: Build tfrs Backend - run: | - cd openshift-v4/templates/backend - oc process -f ./backend-bc-docker.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }} - sleep 2s - for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-backend-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do - echo "canceling $build" - oc -n ${{ env.TOOLS_NAMESPACE }} cancel-build $build - done - sleep 2s - oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-backend-${{ env.BUILD_SUFFIX }} --wait=true - - # build-frontend: - # name: Build TFRS Frontend + # build-backend: + # name: Build tfrs Backend # runs-on: ubuntu-latest # timeout-minutes: 60 # needs: [get-version] - + # env: # BUILD_SUFFIX: ${{ needs.get-version.outputs.VERSION }} @@ -90,17 +55,52 @@ jobs: # insecure_skip_tls_verify: true # namespace: ${{ env.TOOLS_NAMESPACE }} - # - name: Build TFRS Frontend + # - name: Build tfrs Backend # run: | - # cd openshift-v4/templates/frontend - # oc process -f ./frontend-bc-docker.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }} + # cd openshift-v4/templates/backend + # oc process -f ./backend-bc-docker.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }} # sleep 2s - # for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-frontend-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do + # for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-backend-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do # echo "canceling $build" # oc -n ${{ env.TOOLS_NAMESPACE }} cancel-build $build # done # sleep 2s - # oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-frontend-${{ env.BUILD_SUFFIX }} --wait=true + # oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-backend-${{ env.BUILD_SUFFIX }} --wait=true + + build-frontend: + name: Build TFRS Frontend + runs-on: ubuntu-latest + timeout-minutes: 60 + needs: [get-version] + + env: + BUILD_SUFFIX: ${{ needs.get-version.outputs.VERSION }} + + steps: + - name: Check out repository + uses: actions/checkout@v4.1.1 + with: + ref: ${{ env.GIT_REF }} + + - name: Log in to Openshift + uses: redhat-actions/oc-login@v1.3 + with: + openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} + openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} + insecure_skip_tls_verify: true + namespace: ${{ env.TOOLS_NAMESPACE }} + + - name: Build TFRS Frontend + run: | + cd openshift-v4/templates/frontend + oc process -f ./frontend-bc-docker.yaml NAME=tfrs SUFFIX=-${{ env.BUILD_SUFFIX }} VERSION=${{ env.BUILD_SUFFIX }} GIT_URL=${{ env.GIT_URL }} GIT_REF=${{ env.GIT_REF }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }} + sleep 2s + for build in $(oc -n ${{ env.TOOLS_NAMESPACE }} get builds -l buildconfig=tfrs-frontend-${{ env.BUILD_SUFFIX }} -o jsonpath='{.items[?(@.status.phase=="Running")].metadata.name}'); do + echo "canceling $build" + oc -n ${{ env.TOOLS_NAMESPACE }} cancel-build $build + done + sleep 2s + oc -n ${{ env.TOOLS_NAMESPACE }} start-build tfrs-frontend-${{ env.BUILD_SUFFIX }} --wait=true # build-celery: # name: Build TFRS Celery @@ -246,7 +246,7 @@ jobs: name: Deploy Release jan-2025 on Dev runs-on: ubuntu-latest timeout-minutes: 60 - needs: [get-version, build-backend] + needs: [get-version, build-frontend] # needs: [get-version, build-backend, build-frontend, build-celery, build-scan-handler, build-scan-coordinator, build-notification-server] env: @@ -266,6 +266,7 @@ jobs: with: cmd: | yq -i '.image.tag = "${{ env.BUILD_SUFFIX }}"' tfrs/charts/backend/values-dev-jan-2025.yaml + yq -i '.image.tag = "${{ env.BUILD_SUFFIX }}"' tfrs/charts/frontend/values-dev-jan-2025.yaml - name: GitHub Commit & Push shell: bash {0} @@ -288,7 +289,7 @@ jobs: run: | helm -n ${{ env.DEV_NAMESPACE }} list oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-backend:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-backend:${{ env.BUILD_SUFFIX }} - # oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-frontend:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-frontend:${{ env.BUILD_SUFFIX }} + oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-frontend:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-frontend:${{ env.BUILD_SUFFIX }} # oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-celery:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-celery:${{ env.BUILD_SUFFIX }} # oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-scan-coordinator:${{ env.BUILD_SUFFIX }} # oc tag ${{ env.TOOLS_NAMESPACE }}/tfrs-scan-handler:${{ env.BUILD_SUFFIX }} ${{ env.DEV_NAMESPACE }}/tfrs-scan-handler:${{ env.BUILD_SUFFIX }} @@ -299,5 +300,7 @@ jobs: cd tfrs/charts/backend helm -n ${{ env.DEV_NAMESPACE }} -f ./values-dev-jan-2025.yaml upgrade --install tfrs-backend-dev-${{ ENV.VERSION }} . \ --set podAnnotations.rolloutTriggered="A$(date +%s)E" - + cd tfrs/charts/frontend + helm -n ${{ env.DEV_NAMESPACE }} -f ./values-dev-jan-2025.yaml upgrade --install tfrs-frontend-dev-${{ ENV.VERSION }} . \ + --set podAnnotations.rolloutTriggered="A$(date +%s)E" \ No newline at end of file