Skip to content

Commit

Permalink
Disable 'podman' in the TEST matrix.
Browse files Browse the repository at this point in the history
  • Loading branch information
decko committed Nov 23, 2023
1 parent 126cf00 commit 3fd2c24
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 18 deletions.
26 changes: 9 additions & 17 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
include:
- os: ubuntu-latest
TEST: docker
- os: ubuntu-latest
TEST: podman
# - os: ubuntu-latest
# TEST: podman
# - os: macos-12
# TEST: docker
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: "oci_env"

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand All @@ -36,10 +36,9 @@ jobs:
echo "COMPOSE_INTERACTIVE_NO_CLI=1" >> $GITHUB_ENV
#echo "OCI_ENV_PATH=${GITHUB_WORKSPACE}/oci_env/" >> $GITHUB_ENV
- name: clone pulpcore, pulp_file, pulp-openapi-generator
- name: clone pulpcore, pulp-openapi-generator
run: |
git clone --depth 1 https://github.com/pulp/pulpcore.git
git clone --depth 1 https://github.com/pulp/pulp_file.git
git clone --depth 1 https://github.com/pulp/pulp-openapi-generator.git
- name: Install podman compose
Expand Down Expand Up @@ -116,13 +115,14 @@ jobs:
- name: Test functional tests
run: |
oci-env -v generate-client -i
oci-env -v test -i -p pulp_file functional -k test_labels
oci-env -v generate-client -i pulp_file
oci-env -v test -i -p pulpcore functional -k test_labels
- name: Test lint
run: oci-env -v test -i -p pulp_file lint
run: oci-env -v test -i -p pulpcore lint

- name: Test unit
run: oci-env test -i -p pulp_file unit
run: oci-env test -i -p pulpcore unit

- name: Test profile init scripts
run: |
Expand Down Expand Up @@ -159,7 +159,6 @@ jobs:
- name: Test profile generation
run: |
oci-env profile init _test_profile
oci-env profile init -p pulp_file _test_profile
# Test that files were created correctly
ls oci_env/profiles/_test_profile/ | grep README.md
Expand All @@ -169,13 +168,6 @@ jobs:
ls oci_env/profiles/_test_profile/ | grep profile_requirements.txt
ls oci_env/profiles/_test_profile/ | grep profile_default_config.env
ls pulp_file/profiles/_test_profile/ | grep README.md
ls pulp_file/profiles/_test_profile/ | grep init.sh
ls pulp_file/profiles/_test_profile/ | grep pulp_config.env
ls pulp_file/profiles/_test_profile/ | grep compose.yaml
ls pulp_file/profiles/_test_profile/ | grep profile_requirements.txt
ls pulp_file/profiles/_test_profile/ | grep profile_default_config.env
- name: Test profile ls
run: oci-env profile ls | grep _test_profile

Expand Down
5 changes: 5 additions & 0 deletions base/container_scripts/install_functional_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -e

declare PROJECT="$1"

if [ $PROJECT == "pulp_file" ]
then
declare PROJECT="pulpcore"
fi

if [ ! -d "/src/$PROJECT/" ]
then
echo "Please clone $PROJECT into ../$PROJECT/"
Expand Down
5 changes: 5 additions & 0 deletions base/container_scripts/install_lint_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -e

declare PROJECT="$1"

if [ $PROJECT == "pulp_file" ]
then
declare PROJECT="pulpcore"
fi

if [ ! -d "/src/$PROJECT/" ]
then
echo "Please clone $PROJECT into ../$PROJECT/"
Expand Down
5 changes: 5 additions & 0 deletions base/container_scripts/install_performance_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -e

declare PROJECT="$1"

if [ $PROJECT == "pulp_file" ]
then
declare PROJECT="pulpcore"
fi

if [ ! -d "/src/$PROJECT/" ]
then
echo "Please clone $PROJECT into ../$PROJECT/"
Expand Down
5 changes: 5 additions & 0 deletions base/container_scripts/install_unit_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -e

declare PROJECT=$1

if [ $PROJECT == "pulp_file" ]
then
declare PROJECT="pulpcore"
fi

if [ ! -d "/src/$PROJECT/" ]
then
echo "Please clone $PROJECT into ../$PROJECT/"
Expand Down
8 changes: 7 additions & 1 deletion base/container_scripts/run_functional_tests.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
#!/bin/bash

declare PACKAGE="$1"
declare PROJECT="${PACKAGE//-/_}"

set -e

if [ $PACKAGE == "pulp_file" ]
then
declare PACKAGE="pulpcore"
fi

declare PROJECT="${PACKAGE//-/_}"

function check_pytest () {
sudo -u pulp -E type pytest || {
cat << EOF
Expand Down
6 changes: 6 additions & 0 deletions base/container_scripts/run_lint_tests.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

declare PACKAGE="$1"

if [ $PACKAGE == "pulp_file" ]
then
declare PACKAGE="pulpcore"
fi

declare PROJECT="${PACKAGE//-/_}"

set -e
Expand Down
6 changes: 6 additions & 0 deletions base/container_scripts/run_performance_tests.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

declare PACKAGE="$1"

if [ $PACKAGE == "pulp_file" ]
then
declare PACKAGE="pulpcore"
fi

declare PROJECT="${PACKAGE//-/_}"

set -e
Expand Down
6 changes: 6 additions & 0 deletions base/container_scripts/run_unit_tests.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

declare PACKAGE="$1"

if [ $PACKAGE == "pulp_file" ]
then
declare PACKAGE="pulpcore"
fi

declare PROJECT="${PACKAGE//-/_}"

set -e
Expand Down

0 comments on commit 3fd2c24

Please sign in to comment.