PMM-13487 fix the bin_dir path for nomad

percona · Nov 14, 2024 · ffcf7c5 · ffcf7c5
1 parent 031d5dd
commit ffcf7c5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build/scripts/build-client-binary b/build/scripts/build-client-binary
@@ -61,7 +61,7 @@ gobuild_component() {
     elif [ ${component} = 'percona-toolkit' ]; then
       build_command="cd /tmp/go/src/${extract_path}/${component_path} && go build -o ${bin_dir}/${result_file} ."
     elif [ ${component} = 'nomad' ]; then
-      build_command="cd /tmp/go/src/${extract_path} && TARGETS=${target} make deps release"      
+      build_command="cd /tmp/go/src/${extract_path} && TARGETS=${target} make deps release && cp /tmp/go/src/github.com/hashicorp/nomad/pkg/linux_*/nomad ${bin_dir}/bin/nomad"      
     else
       build_command="cd /tmp/go/src/${extract_path}/${component_path} && go build -o ${bin_dir}/${result_file} ."
     fi
@@ -91,6 +91,8 @@ gobuild_component() {
 
         if [ ${component} = vmagent ]; then
           export PMM_RELEASE_FULLCOMMIT=${vmagent_commit_hash}
+        elif [ ${component} = nomad ]; then
+          echo 'Skipping PMM_RELEASE_FULLCOMMIT for nomad...'
         else
           export PMM_RELEASE_FULLCOMMIT=$(git -C sources/${parent_component}/src/${extract_path} rev-parse HEAD)
         fi
@@ -156,7 +158,7 @@ main() {
   gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary"
   gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary"
 
-  cp -r ${tmp_dir}/go/src/github.com/hashicorp/nomad/pkg/linux_*/nomad ${binary_dir}/bin/nomad
+  # cp -r ${tmp_dir}/go/src/github.com/hashicorp/nomad/pkg/linux_*/nomad ${binary_dir}/bin/nomad
 
   rm -rf ${binary_tarball}
   mkdir -p $(dirname ${binary_tarball}) || :