chore: get rid of build.sh and env.props

jenkinsci · Jun 23, 2024 · a956d29 · a956d29
1 parent 417e2cc
commit a956d29
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 29 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
                             timeout(time: 60, unit: 'MINUTES')
                         }
                         environment {
-                            DOCKERHUB_ORGANISATION = "${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"
+                            REGISTRY_ORG = "${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"
                         }
                         stages {
                             stage('Prepare Docker') {
@@ -87,9 +87,9 @@ pipeline {
                                                 // This function is defined in the jenkins-infra/pipeline-library
                                                 infra.withDockerCredentials {
                                                     if (isUnix()) {
-                                                        sh './build.sh -r $REMOTING_VERSION -b $BUILD_NUMBER -d publish'
+                                                        sh 'make publish'
                                                     } else {
-                                                        powershell '& ./build.ps1 -DisableEnvProps publish'
+                                                        powershell '& ./build.ps1 publish'
                                                     }
                                                 }
                                             }

diff --git a/Makefile b/Makefile
@@ -61,6 +61,9 @@ prepare-test: bats check-reqs
 	git submodule update --init --recursive
 	mkdir -p target
 
+publish:
+	@set -x; $(bake_base_cli) linux --push
+
 ## Define bats options based on environment
 # common flags for all tests
 bats_flags := ""

diff --git a/build.ps1 b/build.ps1
@@ -10,8 +10,6 @@ Param(
     # Windows flavor and windows version to build
     [String] $ImageType = 'nanoserver-ltsc2019',
     [String] $BuildNumber = '1',
-    # Set to true to disable env.props
-    [switch] $DisableEnvProps = $false,
     # Print the build and publish command instead of executing them if set
     [switch] $DryRun = $false,
     # Output debug info for tests: 'empty' (no additional test output), 'debug' (test cmd & stderr outputed), 'verbose' (test cmd, stderr, stdout outputed)
@@ -35,17 +33,6 @@ if ($AgentType -ne '' -and $AgentType -in $AgentTypes) {
     $AgentTypes = @($AgentType)
 }
 
-if (!$DisableEnvProps) {
-    Get-Content env.props | ForEach-Object {
-        $items = $_.Split('=')
-        if ($items.Length -eq 2) {
-            $name = $items[0].Trim()
-            $value = $items[1].Trim()
-            Set-Item -Path "env:$($name)" -Value $value
-        }
-    }
-}
-
 if (![String]::IsNullOrWhiteSpace($env:REMOTING_VERSION)) {
     $RemotingVersion = $env:REMOTING_VERSION
 }
@@ -59,8 +46,8 @@ if (![String]::IsNullOrWhiteSpace($env:IMAGE_TYPE)) {
 }
 
 $Organisation = 'jenkins4eval'
-if (![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) {
-    $Organisation = $env:DOCKERHUB_ORGANISATION
+if (![String]::IsNullOrWhiteSpace($env:REGISTRY_ORG)) {
+    $Organisation = $env:REGISTRY_ORG
 }
 
 # Ensure constant env vars used in docker-bake.hcl are defined

diff --git a/env.props b/env.props
diff --git a/updatecli/updatecli.d/remoting.yaml b/updatecli/updatecli.d/remoting.yaml
@@ -106,16 +106,6 @@ targets:
       replacepattern: >-
         $$RemotingVersion${1}= '{{ source "lastVersion" }}',
     scmid: default
-  setEnvProps:
-    name: Bump the Jenkins remoting version on the env.props file
-    kind: file
-    spec:
-      file: env.props
-      matchpattern: >-
-        REMOTING_VERSION=(.*)
-      replacepattern: >-
-        REMOTING_VERSION={{ source "lastVersion" }}
-    scmid: default
 
 actions:
   default: