updates

cryostatio · Sep 19, 2023 · 34f28b9 · 34f28b9
1 parent 26efe7e
commit 34f28b9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 44 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -19,8 +19,6 @@ env:
   CI_BUNDLE_IMG: quay.io/cryostat/cryostat-operator-bundle
   CI_SCORECARD_IMG: quay.io/cryostat/cryostat-operator-scorecard
   CI_PLATFORMS: linux/amd64,linux/arm64
-  REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}
-  REF: ${{ github.event.pull_request.head.ref }}
   OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key"
   OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04"
 

diff --git a/.github/workflows/test-ci-command.yml b/.github/workflows/test-ci-command.yml
@@ -9,16 +9,6 @@ on:
     types:
       - created
 
-env:
-  CI_USER: cryostat+bot
-  CI_REGISTRY: quay.io/cryostat
-  CI_OPERATOR_IMG: quay.io/cryostat/cryostat-operator
-  CI_BUNDLE_IMG: quay.io/cryostat/cryostat-operator-bundle
-  CI_SCORECARD_IMG: quay.io/cryostat/cryostat-operator-scorecard
-  CI_PLATFORMS: linux/amd64,linux/arm64
-  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key"
-  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04"
-
 jobs:
   check-before-test:
     runs-on: ubuntu-latest
@@ -94,7 +84,7 @@ jobs:
         echo "tag=${prefix}-$GITHUB_SHA" >> $GITHUB_OUTPUT
 
   run-test-jobs:
-    uses: ./.github/workflow/test-ci-reusable.yaml
+    uses: ./.github/workflows/test-ci-reusable.yml
     needs: [get-test-image-tag, checkout-branch]
     with:
       repository: ${{ needs.checkout-branch.outputs.PR_repo }}

diff --git a/.github/workflows/test-ci-push.yml b/.github/workflows/test-ci-push.yml
@@ -12,33 +12,9 @@ on:
       - v[0-9]+.[0-9]+
       - cryostat-v[0-9]+.[0-9]+
 
-env:
-  CI_USER: cryostat+bot
-  CI_REGISTRY: quay.io/cryostat
-  CI_OPERATOR_IMG: quay.io/cryostat/cryostat-operator
-  CI_BUNDLE_IMG: quay.io/cryostat/cryostat-operator-bundle
-  CI_SCORECARD_IMG: quay.io/cryostat/cryostat-operator-scorecard
-  CI_PLATFORMS: linux/amd64,linux/arm64
-  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key"
-  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04"
-
 jobs:
-  check-before-test:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    if: github.repository_owner == 'cryostatio'
-    steps:
-    - name: Fail if needs-triage label applied 
-      if: ${{ contains(github.event.issue.labels.*.name, 'needs-triage') }}
-      run: exit 1
-    - name: Fail if safe-to-test label is not applied
-      if: ${{ !contains(github.event.issue.labels.*.name, 'safe-to-test') }}
-      run: exit 1
-
   get-test-image-tag:
     runs-on: ubuntu-latest
-    needs: [check-before-test]
     outputs:
       tag: ${{ steps.compute-tag.outputs.tag }}
     steps:
@@ -52,7 +28,7 @@ jobs:
         echo "tag=${prefix}-$GITHUB_SHA" >> $GITHUB_OUTPUT
   
   run-test-jobs:
-    uses: ./.github/workflow/test-ci-reusable.yaml
+    uses: ./.github/workflows/test-ci-reusable.yml
     needs: [get-test-image-tag]
     with:
       repository: ${{ github.event.pull_request.head.repo.full_name }}

diff --git a/.github/workflows/test-ci-reusable.yml b/.github/workflows/test-ci-reusable.yml
@@ -1,9 +1,3 @@
-name: test-CI-reusable workflow
-
-concurrency:
-  group: ci-${{ github.run_id }}
-  cancel-in-progress: true
-
 on:
   workflow_call:
     inputs:
@@ -17,6 +11,9 @@ on:
         required: true 
         type: string
 
+env: 
+  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key"
+  OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04"
 
 jobs:
   clean-up-test-images: