From 0211f90573d3c01c9eeecf0830c78e64141c68f8 Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Wed, 3 May 2023 16:29:44 +0200 Subject: [PATCH 1/5] tests: Remove volumes created for github runners Maybe we don't need them here? --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d29dfa6..4e17135 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,11 +59,7 @@ jobs: - name: Create ckan container run: | /usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \ - -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \ - -v "/home/runner/work":"/__w" -v "/home/runner/runners/2.299.1/externals":"/__e":ro \ - -v "/home/runner/work/_temp":"/__w/_temp" -v "/home/runner/work/_actions":"/__w/_actions" \ - -v "/opt/hostedtoolcache":"/__t" -v "/home/runner/work/_temp/_github_home":"/github/home" \ - -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" \ + -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" docker start test_ckan - name: Install requirements and set up ckanext From 0f9d405f8a2dfc731cbe5155337af47c355e1753 Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Wed, 3 May 2023 16:32:57 +0200 Subject: [PATCH 2/5] tests: Continue line --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e17135..de357c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,7 @@ jobs: - name: Create ckan container run: | /usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \ - -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" + -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \ --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" docker start test_ckan - name: Install requirements and set up ckanext From 2fc35baa67cf5f05e26cdf4b1c118241fce3a4fd Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Wed, 3 May 2023 16:38:50 +0200 Subject: [PATCH 3/5] tests: Re-add work volume --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de357c3..0869e17 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,7 @@ jobs: run: | /usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \ -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \ - --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" + -v "/home/runner/work":"/__w" --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" docker start test_ckan - name: Install requirements and set up ckanext run: | From 681a817ca74cfac9ed02ba0b06b3191f03add0e1 Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Wed, 3 May 2023 16:41:59 +0200 Subject: [PATCH 4/5] tests: Remove just 'externals' volume --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0869e17..4cfdcc2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,11 @@ jobs: run: | /usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \ -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" \ - -v "/home/runner/work":"/__w" --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" + -v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" \ + -v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" \ + -v "/home/runner/work/_temp/_github_home":"/github/home" \ + -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" \ + --entrypoint "tail" openknowledge/ckan-dev:${{ matrix.ckan-version }} "-f" "/dev/null" docker start test_ckan - name: Install requirements and set up ckanext run: | From 684709f086cdaae4909091184eac78af70959d07 Mon Sep 17 00:00:00 2001 From: Rae Knowler Date: Wed, 3 May 2023 17:03:56 +0200 Subject: [PATCH 5/5] tests: Pin ckanext versions for Py2* --- bin/install_test_requirements.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/install_test_requirements.sh b/bin/install_test_requirements.sh index 1703bf0..601f3b9 100755 --- a/bin/install_test_requirements.sh +++ b/bin/install_test_requirements.sh @@ -7,18 +7,22 @@ pip install -e /__w/ckanext-stadtzh-harvest/ckanext-stadtzh-harvest/ pip install -U requests[security] # Install ckanext dependencies -pip install -e git+https://github.com/ckan/ckanext-dcat.git#egg=ckanext-dcat -pip install -e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest -pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/master/requirements.txt pip install -e git+https://github.com/ckan/ckanext-xloader.git#egg=ckanext-xloader pip install -r https://raw.githubusercontent.com/ckan/ckanext-xloader/master/requirements.txt pip install -e git+https://github.com/opendatazurich/ckanext-stadtzh-theme.git@dockerizing#egg=ckanext-stadtzh-theme pip install -r https://raw.githubusercontent.com/opendatazurich/ckanext-stadtzh-theme/dockerizing/pip-requirements.txt if [ "$1" = "2.9-py2" ]; then - pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/master/requirements-py2.txt + # Install most recent versions that still support Py2 + pip install -e git+https://github.com/ckan/ckanext-dcat.git@0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6#egg=ckanext-dcat + pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6/requirements-py2.txt + pip install -e git+https://github.com/ckan/ckanext-harvest.git@a628782a984a7ee9ac2c51236d3fad4b4e9c7fbb#egg=ckanext-harvest + pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/a628782a984a7ee9ac2c51236d3fad4b4e9c7fbb/requirements.txt else + pip install -e git+https://github.com/ckan/ckanext-dcat.git#egg=ckanext-dcat pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/master/requirements.txt + pip install -e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest + pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/master/requirements.txt fi # Replace default path to CKAN core config file with the one on the container