Fix the test command, rename pex build to package build and fix references

.gitlab-ci.yml

@@ -40,7 +40,7 @@ include:
     - '/ci/push.template.yml'
     - '/ci/cleanup.template.yml'
     - '/ci/unit-test.template.yml'
-    - '/ci/pex-build.template.yml'
+    - '/ci/package-build.template.yml'
 
 
 # Unit testing steps require a specific database image to be available; this step downloads it
@@ -52,9 +52,9 @@ pull db image:
         - docker pull ${REGISTRY_URL}/workspaces/db:workspaces
 
 ###############################################
-# Build Pexes
+# Build Python Packages
 ###############################################
-build pex carta envoy:
+build carta envoy:
   interruptible: true
   stage: build-pexes
   variables:
@@ -64,7 +64,7 @@ build pex carta envoy:
     changes:
       - "apps/cli/executables/pexable/carta_envoy/**/*"
 
-build pex casa envoy:
+build casa envoy:
   interruptible: true
   stage: build-pexes
   variables:
@@ -74,7 +74,17 @@ build pex casa envoy:
     changes:
       - "apps/cli/executables/pexable/casa_envoy/**/*"
 
-build pex conveyor:
+build core sampler:
+  interruptible: true
+  stage: build-pexes
+  variables:
+    PEX_PATH: "apps/cli/utilities/core_sampler"
+  extends: .build-pexes
+  only:
+    changes:
+      - "apps/cli/utilities/core_sampler/**/*"
+
+build conveyor:
   interruptible: true
   stage: build-pexes
   variables:
@@ -84,7 +94,7 @@ build pex conveyor:
     changes:
       - "apps/cli/executables/pexable/conveyor/**/*"
 
-build pex deliver:
+build deliver:
   interruptible: true
   stage: build-pexes
   variables:
@@ -94,7 +104,7 @@ build pex deliver:
     changes:
       - "apps/cli/executables/pexable/deliver/**/*"
 
-build pex ingest:
+build ingest:
   interruptible: true
   stage: build-pexes
   variables:
@@ -104,7 +114,7 @@ build pex ingest:
     changes:
       - "apps/cli/executables/pexable/ingest/**/*"
 
-build pex ingest envoy:
+build ingest envoy:
   interruptible: true
   stage: build-pexes
   variables:
@@ -114,7 +124,7 @@ build pex ingest envoy:
     changes:
       - "apps/cli/executables/pexable/ingest_envoy/**/*"
 
-build pex mediator:
+build mediator:
   interruptible: true
   stage: build-pexes
   variables:
@@ -124,7 +134,7 @@ build pex mediator:
     changes:
       - "apps/cli/executables/pexable/mediator/**/*"
 
-build pex null:
+build null:
   interruptible: true
   stage: build-pexes
   variables:
@@ -134,7 +144,7 @@ build pex null:
     changes:
       - "apps/cli/executables/pexable/null/**/*"
 
-build pex productfetcher:
+build productfetcher:
   interruptible: true
   stage: build-pexes
   variables:
@@ -144,7 +154,7 @@ build pex productfetcher:
     changes:
       - "apps/cli/executables/pexable/productfetcher/**/*"
 
-build pex update stage:
+build update stage:
   interruptible: true
   stage: build-pexes
   variables:
@@ -154,7 +164,7 @@ build pex update stage:
     changes:
       - "apps/cli/executables/pexable/update_stage/**/*"
 
-build pex vela:
+build vela:
   interruptible: true
   stage: build-pexes
   variables:
@@ -164,7 +174,7 @@ build pex vela:
     changes:
       - "apps/cli/executables/pexable/vela/**/*"
 
-build pex wf inspector:
+build wf inspector:
   interruptible: true
   stage: build-pexes
   variables:
@@ -174,7 +184,7 @@ build pex wf inspector:
     changes:
       - "apps/cli/executables/pexable/wf_inspector/**/*"
 
-build pex ws annihilator:
+build ws annihilator:
   interruptible: true
   stage: build-pexes
   variables:
@@ -184,7 +194,7 @@ build pex ws annihilator:
     changes:
       - "apps/cli/executables/pexable/ws_annihilator/**/*"
 
-build pex ws metrics:
+build ws metrics:
   interruptible: true
   stage: build-pexes
   variables:
@@ -324,23 +334,6 @@ push web:
     # needs:
     #     - unit test dev ui
 
-push core_sampler:
-  image: python:latest
-  stage: push
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
-    - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
-    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/'
-  before_script:
-    - cd apps/cli/utilities/core_sampler
-    - pip install poetry
-  script:
-    - poetry build
-    - poetry config repositories.gitlab "https://gitlab.nrao.edu/api/v4/projects/$CI_PROJECT_ID/packages/pypi"
-    - poetry config http-basic.gitlab gitlab-ci-token "$CI_JOB_TOKEN"
-    - poetry publish --repository gitlab
-
 ###############################################
 # Clean Pipeline of Service and Web Images
 ###############################################

ci/pex-build.template.yml → ci/package-build.template.yml

@@ -7,7 +7,7 @@
         - cd ${PEX_PATH}
         - poetry install --with test
         - poetry build
-        - pytest test
+        - $(poetry env info -p)/bin/pytest test
         - poetry config repositories.gitlab "https://gitlab.nrao.edu/api/v4/projects/$CI_PROJECT_ID/packages/pypi"
         - poetry config http-basic.gitlab gitlab-ci-token "$CI_JOB_TOKEN"
         - poetry publish --repository gitlab