From c2f49c6ccee36ea3d0fc086e8124f6c88de017cb Mon Sep 17 00:00:00 2001 From: mchavez Date: Mon, 24 Jun 2024 10:05:07 -0600 Subject: [PATCH 01/19] Updating ci --- .github/workflows/ci.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5dadcb7..0ba0001 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,15 +39,31 @@ jobs: test: runs-on: ubuntu-latest + services: + jenkins: + # https://hub.docker.com/r/jenkins/jenkins + image: jenkins/jenkins:latest + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + env: + # disable setup wizard + JCasC path + JAVA_OPTS: -Djenkins.install.runSetupWizard=false -Dcasc.jenkins.config=/casc_configs + ports: + - 8080:8080 + - 50000:50000 + agent1: + image: jenkins/jnlp-agent-jdk11 + env: BATON_JENKINS_USERNAME: ${{ secrets.BATON_JENKINS_USERNAME }} BATON_JENKINS_PASSWORD: ${{ secrets.BATON_JENKINS_PASSWORD }} BATON_JENKINS_TOKEN: ${{ secrets.BATON_JENKINS_TOKEN }} BATON_JENKINS_BASEURL: ${{ secrets.BATON_JENKINS_BASEURL }} BATON_LOG_LEVEL: debug - CONNECTOR_GRANT: 'grant:entitlement:group:1234:member:user:9876' - CONNECTOR_ENTITLEMENT: 'entitlement:group:1234:member' - CONNECTOR_PRINCIPAL: 'user:9876' + CONNECTOR_GRANT: 'role:reviewer:reviewer:user:localuser' + CONNECTOR_ENTITLEMENT: 'role:reviewer:reviewer' + CONNECTOR_PRINCIPAL: 'localuser' CONNECTOR_PRINCIPAL_TYPE: 'user' steps: - name: Install Go From 7b00f2d888924bf737f214794de048f9267e5319 Mon Sep 17 00:00:00 2001 From: mchavez Date: Mon, 24 Jun 2024 11:35:05 -0600 Subject: [PATCH 02/19] POC for ci --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0ba0001..6b9746b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,9 +43,9 @@ jobs: jenkins: # https://hub.docker.com/r/jenkins/jenkins image: jenkins/jenkins:latest - credentials: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + # credentials: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} env: # disable setup wizard + JCasC path JAVA_OPTS: -Djenkins.install.runSetupWizard=false -Dcasc.jenkins.config=/casc_configs From 8fe2aba7dc5440d3f54cad064d493a454de161f3 Mon Sep 17 00:00:00 2001 From: mchavez Date: Mon, 24 Jun 2024 12:14:09 -0600 Subject: [PATCH 03/19] Updating ci --- .github/workflows/ci.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b9746b..862c14f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,9 +43,6 @@ jobs: jenkins: # https://hub.docker.com/r/jenkins/jenkins image: jenkins/jenkins:latest - # credentials: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} env: # disable setup wizard + JCasC path JAVA_OPTS: -Djenkins.install.runSetupWizard=false -Dcasc.jenkins.config=/casc_configs @@ -57,9 +54,8 @@ jobs: env: BATON_JENKINS_USERNAME: ${{ secrets.BATON_JENKINS_USERNAME }} - BATON_JENKINS_PASSWORD: ${{ secrets.BATON_JENKINS_PASSWORD }} BATON_JENKINS_TOKEN: ${{ secrets.BATON_JENKINS_TOKEN }} - BATON_JENKINS_BASEURL: ${{ secrets.BATON_JENKINS_BASEURL }} + BATON_JENKINS_BASEURL: http://localhost:8080 BATON_LOG_LEVEL: debug CONNECTOR_GRANT: 'role:reviewer:reviewer:user:localuser' CONNECTOR_ENTITLEMENT: 'role:reviewer:reviewer' @@ -74,8 +70,8 @@ jobs: uses: actions/checkout@v4 - name: Build baton-jenkins run: go build ./cmd/baton-jenkins - # - name: Run baton-jenkins - # run: ./baton-jenkins + - name: Run baton-jenkins + run: ./baton-jenkins - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin \ No newline at end of file From bbc4d82990fde7a059a1b6b7cbfa35f5961507a7 Mon Sep 17 00:00:00 2001 From: mchavez Date: Mon, 24 Jun 2024 12:27:15 -0600 Subject: [PATCH 04/19] Updating ci --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 862c14f..7b5d58f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,7 +71,7 @@ jobs: - name: Build baton-jenkins run: go build ./cmd/baton-jenkins - name: Run baton-jenkins - run: ./baton-jenkins + run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin \ No newline at end of file From 8d8ebbd1091a7a3f092bffa9398d348e22190b63 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:43:07 +0000 Subject: [PATCH 05/19] Updating baton capabilities. --- baton_capabilities.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/baton_capabilities.json b/baton_capabilities.json index 6e2489c..571ca3b 100644 --- a/baton_capabilities.json +++ b/baton_capabilities.json @@ -1,6 +1,19 @@ { "@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities", "resourceTypeCapabilities": [ + { + "resourceType": { + "id": "group", + "displayName": "Group", + "traits": [ + "TRAIT_GROUP" + ] + }, + "capabilities": [ + "CAPABILITY_SYNC", + "CAPABILITY_PROVISION" + ] + }, { "resourceType": { "id": "job", @@ -34,7 +47,8 @@ ] }, "capabilities": [ - "CAPABILITY_SYNC" + "CAPABILITY_SYNC", + "CAPABILITY_PROVISION" ] }, { @@ -68,6 +82,7 @@ } ], "connectorCapabilities": [ + "CAPABILITY_PROVISION", "CAPABILITY_SYNC" ] } \ No newline at end of file From ade8f43303956ea020f07e2b309bbebccf6de1a8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:43:35 +0000 Subject: [PATCH 06/19] Updating baton capabilities. --- baton_capabilities.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/baton_capabilities.json b/baton_capabilities.json index 571ca3b..54a6745 100644 --- a/baton_capabilities.json +++ b/baton_capabilities.json @@ -82,7 +82,7 @@ } ], "connectorCapabilities": [ - "CAPABILITY_PROVISION", - "CAPABILITY_SYNC" + "CAPABILITY_SYNC", + "CAPABILITY_PROVISION" ] } \ No newline at end of file From f4b814e3ecb42042c5f7fb3a4404ccf26a9770b2 Mon Sep 17 00:00:00 2001 From: mchavez Date: Mon, 24 Jun 2024 18:19:05 -0600 Subject: [PATCH 07/19] Quick changes --- .github/workflows/ci.yaml | 4 ++-- pkg/client/internal_integration_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7b5d58f..e9ab4e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,7 +71,7 @@ jobs: - name: Build baton-jenkins run: go build ./cmd/baton-jenkins - name: Run baton-jenkins - run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} - - name: Install baton + # run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} + # - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin \ No newline at end of file diff --git a/pkg/client/internal_integration_test.go b/pkg/client/internal_integration_test.go index 096a7d3..6953432 100644 --- a/pkg/client/internal_integration_test.go +++ b/pkg/client/internal_integration_test.go @@ -19,7 +19,7 @@ var ( ) func TestJenkinsClient_GetNodes(t *testing.T) { - if userName == "" && password == "" && token == "" { + if userName == "" && (password == "" || token == "") { t.Skip() } @@ -30,7 +30,7 @@ func TestJenkinsClient_GetNodes(t *testing.T) { } func TestJenkinsClient_GetJobs(t *testing.T) { - if userName == "" && password == "" && token == "" { + if userName == "" && (password == "" || token == "") { t.Skip() } From 442bd375b1cce91c2e8a07fa95acd4cb26599674 Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 10:37:12 -0600 Subject: [PATCH 08/19] Adding jenkins backup without plugins --- jenkins-backup.tar.gz | Bin 0 -> 10167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jenkins-backup.tar.gz diff --git a/jenkins-backup.tar.gz b/jenkins-backup.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..46f4c84b24900c31a85fe25539c1f8fd4195835c GIT binary patch literal 10167 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 Date: Tue, 25 Jun 2024 11:17:06 -0600 Subject: [PATCH 09/19] Updating ci and importing jenkins backup --- .github/workflows/ci.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e9ab4e8..76ad5e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,8 +70,11 @@ jobs: uses: actions/checkout@v4 - name: Build baton-jenkins run: go build ./cmd/baton-jenkins - - name: Run baton-jenkins + - name: Import jenkins backup + run: | + tar xvfz jenkins-backup.tar.gz $JENKINS_HOME + # - name: Run baton-jenkins # run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} - # - name: Install baton + - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin \ No newline at end of file From 96ef6009e924876b1a58235d36ce9f7a353f0738 Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 11:20:28 -0600 Subject: [PATCH 10/19] Updating ci --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 76ad5e8..b5f8e35 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,8 +73,8 @@ jobs: - name: Import jenkins backup run: | tar xvfz jenkins-backup.tar.gz $JENKINS_HOME - # - name: Run baton-jenkins - # run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin + - name: Run baton-jenkins + run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} \ No newline at end of file From eeb5e5da4360cc6ac2cee82d5ca2f24371f8b87d Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:17:46 -0600 Subject: [PATCH 11/19] Adding credentials --- jenkins-credentials.tar.gz | Bin 0 -> 1373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jenkins-credentials.tar.gz diff --git a/jenkins-credentials.tar.gz b/jenkins-credentials.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1a81694a4fd61ef6c325e71161d0c34a654b83d1 GIT binary patch literal 1373 zcmV-j1)};NiwFP!000001MQf9P!&}a$FWq*(Lyv35<^8DLzcaJ@7~=NFfm_>KSl*q zvK;2_?p=7odrx=Y6ExFMQi*aLwNWEU)Y0$&p&(j+?{*R?z!J{&a6Qdow}J6I@_zoU`;SWx2`7lURhv{0m6{SJkKHC ziv@tkz$=(-IhXF@G2BEC4))SrF870;Yi|BuiYikK2@(mEG*y6{BC-$I8 zld&hE=HT4;j!So)?e}weUuAf4*Yrxivwocx_|8GLIkp6KP^aHuxA^tf%S)X{DyJVG zE0pi-{zpjvc4_t3)3?P9Ywy`8|5%{s6bE(9AHSE)2JNDXm%qRJ;|Yh-0@BCF{O(+| z{{*umbVzZ2N_^INpIsx~Ua_u(&GxAes8~2~=X?DpjR`rETpd4jR^c zDqUAzR&-%ca?RARkLqdc8)to4ot=Fl}8Q~*F8d(9whe`@Q@p&wA65peu z+okBY)=qgo`11Y*(O0|XO+C{M7ccq61$?i;rNq)$rZS@&?-bqRkmE?|!=3zQ>p%KS{pTC9FY(mGH9;FPLBitdU)$P0itGS;Z+$UiAoaBDv+b* zK$aAwh(O|ixd1@Cs7Sm7Wmyz(!}3tl6hsw)vY1M;$`TccL>5#@kpvA&oT6w%Q#lGT z)i6|5MI?ZTlKHYCz?>$ktk~AyzpZJ~ze`VI8hZf6&NztO+0Y7jQmMh1CO2^^G|{e7 zr`ztH&BQcXVwwzNY%e`vkAKqtvn=#tIrHFI^}ki{-F~R(>4VF%a{c!iyQlSga`_8& zM&|0enjL+r*Cj^|TD2nDd)2kAx%#%if#YVxc&AL>-ytu#kLR0>8^WJW+I>0ZQXoCN zAb3&L|(xR|-xra~m5BOp-_|}$@v+{NSi*x4o3d|bvX<5;2hV$){=+;D?U5#tkvoYa!$u)Mx+~^J`4)a zEpWy!3wdK%P|%T@<)Mi;uU|M>F%$1R(DTJNFGgP9bRoiCa^*x}q1%66HcQ^^aJJ8} zcLpaFyHXN^yGPCbI_|Wsa!Fp#ki{i|eig?*&+{2LB{I+x%WL)Htp5M5{*4*B-I=86 z#6iLH-9ednR|<6wCk9nx8;#>=9Mxyp z6*GA_h|+xjkMH^a10lf3(tm64ME=T3vi>yb5Lf*{cfGG%AAfH1(eKKAza0J4s4ZKD f=KbIGVPRomVPRomVPRom@n7Lj0;fOb04M+el7+h2 literal 0 HcmV?d00001 From 0a8872944ffd10cbeb8c929e6f2f49135a4d140b Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:21:42 -0600 Subject: [PATCH 12/19] Adding credentials --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5f8e35..6b21bb0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,6 +73,7 @@ jobs: - name: Import jenkins backup run: | tar xvfz jenkins-backup.tar.gz $JENKINS_HOME + tar xvfz jenkins-credentials.tar.gz $JENKINS_HOME/secrets/ - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin - name: Run baton-jenkins From b83b0ca9aba9510edd4b5c0108208df464a7026b Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:27:34 -0600 Subject: [PATCH 13/19] Adding credentials --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b21bb0..10beea7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,7 +73,7 @@ jobs: - name: Import jenkins backup run: | tar xvfz jenkins-backup.tar.gz $JENKINS_HOME - tar xvfz jenkins-credentials.tar.gz $JENKINS_HOME/secrets/ + tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin - name: Run baton-jenkins From c9379088838fba33363bb35401b5857f64d52c34 Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:32:24 -0600 Subject: [PATCH 14/19] Adding credentials --- .github/workflows/ci.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 10beea7..5212c22 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,10 +72,11 @@ jobs: run: go build ./cmd/baton-jenkins - name: Import jenkins backup run: | - tar xvfz jenkins-backup.tar.gz $JENKINS_HOME - tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ + ls -la + # tar xvfz jenkins-backup.tar.gz $JENKINS_HOME + # tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton run: ./scripts/get-baton.sh && mv baton /usr/local/bin - - name: Run baton-jenkins - run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} + # - name: Run baton-jenkins + # run: ./baton-jenkins --log-level=debug --jenkins-username adminuser --jenkins-token ${{ env.BATON_JENKINS_TOKEN }} \ No newline at end of file From 8b6cd1e81973a892a188b95ac9330da80a185f59 Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:43:36 -0600 Subject: [PATCH 15/19] Adding credentials --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5212c22..d9f6498 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,6 +73,7 @@ jobs: - name: Import jenkins backup run: | ls -la + docker exec jenkins-latest ls -la # tar xvfz jenkins-backup.tar.gz $JENKINS_HOME # tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton From f8709e41133be2a2c2278f8ff74f2c4794d2302c Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:45:52 -0600 Subject: [PATCH 16/19] Adding credentials --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9f6498..c6cb096 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,7 +73,8 @@ jobs: - name: Import jenkins backup run: | ls -la - docker exec jenkins-latest ls -la + docker ps + # docker exec jenkins-latest ls -la # tar xvfz jenkins-backup.tar.gz $JENKINS_HOME # tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton From e976e2114e1679c9190fc2c2f896c4484dba7b2f Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 14:54:42 -0600 Subject: [PATCH 17/19] Adding credentials --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c6cb096..e5d46be 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -74,7 +74,7 @@ jobs: run: | ls -la docker ps - # docker exec jenkins-latest ls -la + docker exec jenkins/jenkins:latest ls -la # tar xvfz jenkins-backup.tar.gz $JENKINS_HOME # tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton From 63a5c16b71de3046b552302524f4005f9b8b51d2 Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 15:08:44 -0600 Subject: [PATCH 18/19] Adding credentials --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e5d46be..baa05f4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -61,6 +61,7 @@ jobs: CONNECTOR_ENTITLEMENT: 'role:reviewer:reviewer' CONNECTOR_PRINCIPAL: 'localuser' CONNECTOR_PRINCIPAL_TYPE: 'user' + container: jenkins/jenkins:latest steps: - name: Install Go uses: actions/setup-go@v5 @@ -74,7 +75,7 @@ jobs: run: | ls -la docker ps - docker exec jenkins/jenkins:latest ls -la + # docker exec jenkins/jenkins:latest ls -la # tar xvfz jenkins-backup.tar.gz $JENKINS_HOME # tar xvfz jenkins-credentials.tar.gz /var/jenkins_home/secrets/ - name: Install baton From cfafb8c0398514fe81787c86f8fcc6a7a039ae1e Mon Sep 17 00:00:00 2001 From: mchavez Date: Tue, 25 Jun 2024 15:26:03 -0600 Subject: [PATCH 19/19] Quick change --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index baa05f4..8adb284 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -61,7 +61,6 @@ jobs: CONNECTOR_ENTITLEMENT: 'role:reviewer:reviewer' CONNECTOR_PRINCIPAL: 'localuser' CONNECTOR_PRINCIPAL_TYPE: 'user' - container: jenkins/jenkins:latest steps: - name: Install Go uses: actions/setup-go@v5