ci: rename images #6

Author: tristan-greffe

.github/workflows/main.yml

@@ -8,13 +8,13 @@ on:
         default: false
         required: false
         type: boolean
-      build_service:
-        description: "Build service"
+      build_api:
+        description: "Build api"
         default: false
         required: false
         type: boolean
-      build_ingestion_job:
-        description: "Build ingestion job"
+      build_ingestion:
+        description: "Build ingestion"
         default: false
         required: false
         type: boolean
@@ -47,8 +47,8 @@ jobs:
         env:
           SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
         run: bash ./scripts/run_tests.sh -s -r ${{ github.job }}
-  build_service:
-    name: Build service
+  build_api:
+    name: Build api
     if: ${{ !contains(github.event.head_commit.message, 'skip build') }}
     runs-on: ubuntu-22.04
     steps:
@@ -62,12 +62,12 @@ jobs:
         env:
           KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
         run: bash ./scripts/setup_workspace.sh
-      - name: Build service
+      - name: Build api
         env:
           SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
-        run: bash ./scripts/build_service.sh -p -r ${{ github.job }}
-  build_ingestion_job:
-    name: Build ingestion job
+        run: bash ./scripts/build_api.sh -p -r ${{ github.job }}
+  build_ingestion:
+    name: Build ingestion
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
@@ -80,10 +80,10 @@ jobs:
         env:
           KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
         run: bash ./scripts/setup_workspace.sh
-      - name: Build service
+      - name: Build ingestion
         env:
           SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
-        run: bash ./scripts/build_ingestion_job.sh -p -r ${{ github.job }}
+        run: bash ./scripts/build_ingestion.sh -p -r ${{ github.job }}
   build_docs:
     name: Build docs
     if: ${{

scripts/build_service.sh scripts/build_api.shscripts/build_service.sh renamed to scripts/build_api.sh

@@ -13,7 +13,7 @@ WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 ##
 
 PUBLISH=false
-CI_STEP_NAME="Build service"
+CI_STEP_NAME="Build api"
 while getopts "pr:" option; do
     case $option in
         p) # publish app
@@ -32,7 +32,9 @@ done
 ## Init workspace
 ##
 
-NAME=$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.name')
+## Same shape as the ingestion image (knowledge-ingestion): the project name
+## plus the component the image runs.
+NAME="$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.name')-api"
 VERSION=$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.version')
 GIT_TAG=$(get_git_tag "$ROOT_DIR")
 

scripts/build_ingestion_job.sh scripts/build_ingestion.shscripts/build_ingestion_job.sh renamed to scripts/build_ingestion.sh

@@ -13,7 +13,7 @@ WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
 ##
 
 PUBLISH=false
-CI_STEP_NAME="Build ingestion job"
+CI_STEP_NAME="Build ingestion"
 while getopts "pr:" option; do
     case $option in
         p) # publish app
@@ -32,7 +32,9 @@ done
 ## Init workspace
 ##
 
-NAME="$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.name')-job"
+## Same shape as the api image (knowledge-api): the project name plus the
+## component the image runs.
+NAME="$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.name')-ingestion"
 VERSION=$(get_toml_value "$ROOT_DIR/pyproject.toml" 'project.version')
 
 echo "About to build $NAME v$VERSION ..."

scripts/init_runner.sh

@@ -15,11 +15,11 @@ init_github_run_tests() {
     install_reqs age sops sonar_scanner_cli micromamba
 }
 
-init_github_build_service() {
+init_github_build_api() {
     install_reqs age sops
 }
 
-init_github_build_ingestion_job() {
+init_github_build_ingestion() {
     install_reqs age sops
 }