Do not merge

GoogleCloudPlatform · Dec 19, 2024 · 3416b75 · 3416b75
1 parent efddd1c
commit 3416b75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/actions/fabric-tests/action.yml b/.github/actions/fabric-tests/action.yml
@@ -43,7 +43,7 @@ runs:
         terraform_version: ${{ inputs.TERRAFORM_VERSION }}
         terraform_wrapper: false
 
-    - uses: opentofu/setup-opentofu@v1
+    - uses: opentofu/setup-opentofu@v1.0.4
       if: ${{ inputs.TERRAFORM_FLAVOUR == 'tofu' }}
       with:
         tofu_version: ${{ inputs.TERRAFORM_VERSION }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -71,7 +71,7 @@ jobs:
           terraform_version: ${{ matrix.version  }}
           terraform_wrapper: false
 
-      - uses: opentofu/setup-opentofu@v1
+      - uses: opentofu/setup-opentofu@v1.0.4
         if: ${{ matrix.flavour == 'tofu' }}
         with:
           tofu_version: ${{ matrix.version }}
@@ -154,7 +154,10 @@ jobs:
       - name: Run tests on documentation examples
         env:
           TERRAFORM: ${{ matrix.flavour }}
-        run: pytest -vv ${{ matrix.flavour == 'terraform' && '-n4' || '-n4' }} --tb=line --junit-xml=test-results-raw.xml -k "terraform and modules/" tests/examples
+        run:
+          echo TERRAFORM=${TERRAFORM} ;
+          alias terraform=tofu
+          pytest -vv -n4 --tb=line --junit-xml=test-results-raw.xml -k "terraform and modules/" tests/examples
 
       - name: Create report
         uses: ./.github/actions/post-fabric-tests
@@ -212,7 +215,9 @@ jobs:
       - name: Run tests modules
         env:
           TERRAFORM: ${{ matrix.flavour }}
-        run: pytest -vv ${{ matrix.flavour == 'terraform' && '-n4' || '-n4' }} --tb=line --junit-xml=test-results-raw.xml tests/modules
+        run: |
+          echo TERRAFORM=${TERRAFORM} ;
+          pytest -vv ${{ matrix.flavour == 'terraform' && '-n4' || '-n4' }} --tb=line --junit-xml=test-results-raw.xml tests/modules
 
       - name: Create report
         uses: ./.github/actions/post-fabric-tests

diff --git a/README.md b/README.md
@@ -44,4 +44,5 @@ For more information and usage examples see each module's README file.
 
 The [blueprints](./blueprints/) in this repository are split into several main sections: **[networking blueprints](./blueprints/networking/)** that implement core patterns or features, **[data solutions blueprints](./blueprints/data-solutions/)** that demonstrate how to integrate data services in complete scenarios, **[cloud operations blueprints](./blueprints/cloud-operations/)** that leverage specific products to meet specific operational needs, and **[factories](./blueprints/factories/)** that implement resource factories for the repetitive creation of specific resources, and finally **[GKE](./blueprints/gke)**, **[serverless](./blueprints/serverless)**, and **[third-party solutions](./blueprints/third-party-solutions/)** design blueprints.
 
+.
 <!-- $Id$ -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,4 +44,5 @@ For more information and usage examples see each module's README file.

		The [blueprints](./blueprints/) in this repository are split into several main sections: [networking blueprints](./blueprints/networking/) that implement core patterns or features, [data solutions blueprints](./blueprints/data-solutions/) that demonstrate how to integrate data services in complete scenarios, [cloud operations blueprints](./blueprints/cloud-operations/) that leverage specific products to meet specific operational needs, and [factories](./blueprints/factories/) that implement resource factories for the repetitive creation of specific resources, and finally [GKE](./blueprints/gke), [serverless](./blueprints/serverless), and [third-party solutions](./blueprints/third-party-solutions/) design blueprints.

		.
		<!-- $Id$ -->