diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 62d0e5d..c7fb14d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -54,6 +54,12 @@ jobs: with: python-version: "3.12" + - name: Install Terraform 1.9.* + run: | + wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update && sudo apt-get install -y terraform=1.9.* + - name: Install test dependencies run: pip install -r requirements-test.txt @@ -70,6 +76,12 @@ jobs: with: python-version: "3.12" + - name: Install Terraform 1.9.* + run: | + wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update && sudo apt-get install -y terraform=1.9.* + - name: Install runtime dependencies run: pip install jsonschema pyyaml boto3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62d0e5d..c7fb14d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,12 @@ jobs: with: python-version: "3.12" + - name: Install Terraform 1.9.* + run: | + wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update && sudo apt-get install -y terraform=1.9.* + - name: Install test dependencies run: pip install -r requirements-test.txt @@ -70,6 +76,12 @@ jobs: with: python-version: "3.12" + - name: Install Terraform 1.9.* + run: | + wget -qO- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt-get update && sudo apt-get install -y terraform=1.9.* + - name: Install runtime dependencies run: pip install jsonschema pyyaml boto3 diff --git a/tests/test_adapter.py b/tests/test_adapter.py index 6d3db12..ffd0bde 100644 --- a/tests/test_adapter.py +++ b/tests/test_adapter.py @@ -230,9 +230,6 @@ class TestAdapterEmitsValidTerraform: """The adapter-emitted root main.tf must pass terraform validate.""" def test_s3_instance_emits_valid_terraform(self, tmp_path): - import shutil - if not shutil.which("terraform"): - pytest.skip("terraform binary not installed — run in a CI job with Terraform") instance = json.load(open(ROOT / "modules/l1/s3/instance.json")) adapt(instance, str(tmp_path)) result = subprocess.run(