Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport standard-runners]: Backports PRs #187 #188 #189 #190 #191

Merged
merged 12 commits into from
Mar 12, 2024

Conversation

ulucinar
Copy link
Contributor

Description of your changes

Backports PRs #187 #188 #189 #190 to the standard-runners branch. We will be maintaining this branch until #135 is merged (being able to pass only hosted runner labels as the parameter values poses a serious limitation to this approach, especially if we also have OCI runners).

I have:

  • Run make reviewable test to ensure this PR is ready for review.

How has this code been tested

Following diff is the diff between this PR's feature branch & head of upstream/main:

diff --git a/.github/workflows/pr-comment-trigger.yml b/.github/workflows/pr-comment-trigger.yml
index 25f52a0..a5610c3 100644
--- a/.github/workflows/pr-comment-trigger.yml
+++ b/.github/workflows/pr-comment-trigger.yml
@@ -42,7 +42,7 @@ on:
 
 jobs:
   debug:
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     steps:
       - name: Debug
         run: |
@@ -55,7 +55,7 @@ jobs:
     if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' ) &&
             github.event.issue.pull_request &&
             contains(github.event.comment.body, inputs.trigger-keyword ) }}
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     outputs:
       example_list: ${{ steps.get-example-list-name.outputs.example-list }}
       example_hash: ${{ steps.get-example-list-name.outputs.example-hash }}
@@ -112,7 +112,7 @@ jobs:
     if: ${{ (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' ) &&
       github.event.issue.pull_request &&
       contains(github.event.comment.body, inputs.trigger-keyword ) }}
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     needs: get-example-list
 
     steps:
diff --git a/.github/workflows/provider-ci.yml b/.github/workflows/provider-ci.yml
index da9715c..46f427f 100644
--- a/.github/workflows/provider-ci.yml
+++ b/.github/workflows/provider-ci.yml
@@ -84,7 +84,7 @@ jobs:
         run: |
           make schema-version-diff
   lint:
-    runs-on: Ubuntu-Jumbo-Runner
+    runs-on: ubuntu-22.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true' && !inputs.golangci-skip
 
@@ -343,7 +343,7 @@ jobs:
         run: make local-deploy
 
   publish-artifacts:
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
diff --git a/.github/workflows/provider-publish-service-artifacts.yml b/.github/workflows/provider-publish-service-artifacts.yml
index 28e91f5..c43483b 100644
--- a/.github/workflows/provider-publish-service-artifacts.yml
+++ b/.github/workflows/provider-publish-service-artifacts.yml
@@ -57,7 +57,7 @@ env:
   
 jobs:
   index:
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     outputs:
       indices: ${{ steps.calc.outputs.indices }}
     steps:
@@ -71,7 +71,7 @@ jobs:
         index: ${{ fromJSON(needs.index.outputs.indices) }}
 
     needs: index
-    runs-on: [e2-standard-8, linux]
+    runs-on: ubuntu-22.04
     steps:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2

ulucinar and others added 12 commits March 11, 2024 20:23
…omment-trigger & provider-ci reusable workflows

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit fa17907)
- buildtagger can be used to generate the desired build tags (constraints)
  for the official provider families.
- Each resource provider's source modules can share a unique build
  tag so that tag-aware Go tools (including golangci-lint) can
  load only those source modules.

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit f069865)
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit df38579)
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit 73dcf55)
… exit non-zero

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit 032f662)
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit a467b51)
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit 574bdd3)
Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit ed0270f)
…w to

conditionally skip the "lint" job.

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit 790ea72)
…exity

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit e05c869)
Signed-off-by: Sergen Yalçın <[email protected]>
(cherry picked from commit 2d89b1e)
… login -u"

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
(cherry picked from commit 37ae29b)
@ulucinar ulucinar requested a review from sergenyalcin as a code owner March 11, 2024 17:49
@ulucinar ulucinar changed the base branch from main to standard-runners March 11, 2024 17:49
Copy link
Member

@sergenyalcin sergenyalcin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ulucinar LGTM!

@ulucinar ulucinar merged commit fd8ec1e into upbound:standard-runners Mar 12, 2024
6 checks passed
@ulucinar ulucinar deleted the cp-sr branch March 12, 2024 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants