GHA updates

anaconda · Dec 18, 2023 · 227e6f2 · 227e6f2
1 parent 0505fdf
commit 227e6f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -14,7 +14,19 @@ jobs:
     - name: Linting
       run: |
         anaconda-project run lint
+    - name: Run Unit Tests
+      run: |
+        anaconda-project run test:unit
     - name: Build the package
+      run: |
+        source $CONDA/etc/profile.d/conda.sh
+        rm -f $CONDA/conda-bld/noarch/ae5-tools-*.tar.bz2
+        conda install -y conda-build conda-verify anaconda-client
+        conda build conda-recipe
+    - name: Run Integration Tests
+      run: |
+        anaconda-project run test:integration:slipstream
+    - name: Run System Tests
       env:
         AE5_HOSTNAME: aip.anaconda.com
         AE5_USERNAME: tooltest
@@ -24,10 +36,7 @@ jobs:
         AE5_K8S_ENDPOINT: ssh:centos
         AE5_K8S_PORT: 23456
       run: |
-        source $CONDA/etc/profile.d/conda.sh
-        rm -f $CONDA/conda-bld/noarch/ae5-tools-*.tar.bz2
-        conda install -y conda-build conda-verify anaconda-client
-        conda build conda-recipe
+        anaconda-project run test:system
     - name: Upload to anaconda.org (Dev Build)
       env:
         ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -14,14 +14,6 @@ jobs:
       with:
         fetch-depth: 0
     - name: Build the package
-      env:
-        AE5_HOSTNAME: aip.anaconda.com
-        AE5_USERNAME: tooltest
-        AE5_PASSWORD: ${{ secrets.AE5_PASSWORD }}
-        AE5_ADMIN_USERNAME: admin
-        AE5_ADMIN_PASSWORD: ${{ secrets.AE5_ADMIN_PASSWORD }}
-        AE5_K8S_ENDPOINT: ssh:centos
-        AE5_K8S_PORT: 23456
       run: |
         source $CONDA/etc/profile.d/conda.sh
         rm -f $CONDA/conda-bld/noarch/ae5-tools-*.tar.bz2

diff --git a/anaconda-project.yml b/anaconda-project.yml
@@ -67,6 +67,12 @@ commands:
     env_spec: default
     unix: py.test --cov=ae5_tools -v tests/integration  --cov-append --cov-report=xml -vv
 
+  test:integration:slipstream:
+    env_spec: default
+    unix: |
+      conda install $CONDA/conda-bld/noarch/ae5-tools-*.tar.bz2
+      py.test --cov=ae5_tools -v tests/integration  --cov-append --cov-report=xml -vv
+
   test:system:
     env_spec: default
     unix: |