diff options
| -rw-r--r-- | hicn-light/src/hicn/core/forwarder.c | 2 | ||||
| -rw-r--r-- | hicn-plugin/src/interest_pcslookup_node.c | 2 | ||||
| -rw-r--r-- | lib/src/test/test_interest_manifest.cc | 4 | ||||
| -rw-r--r-- | scripts/functions.sh | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/hicn-light/src/hicn/core/forwarder.c b/hicn-light/src/hicn/core/forwarder.c index d148f845d..60493a9c5 100644 --- a/hicn-light/src/hicn/core/forwarder.c +++ b/hicn-light/src/hicn/core/forwarder.c @@ -979,7 +979,7 @@ static ssize_t forwarder_process_aggregated_interest( // then just iterate the interest manifest and update the suffix in the name // struct hicn_name_suffix_t *suffix; - int pos; + unsigned long pos; interest_manifest_foreach_suffix(int_manifest_header, suffix, pos) { // Update name hicn_name_set_suffix(&name_copy, *suffix); diff --git a/hicn-plugin/src/interest_pcslookup_node.c b/hicn-plugin/src/interest_pcslookup_node.c index 743227c18..4947b67ff 100644 --- a/hicn-plugin/src/interest_pcslookup_node.c +++ b/hicn-plugin/src/interest_pcslookup_node.c @@ -200,7 +200,7 @@ hicn_interest_manifest_pcslookup_node_inline (vlib_main_t *vm, u32 next0 = HICN_INTEREST_PCSLOOKUP_NEXT_ERROR_DROP; hicn_pcs_entry_t *pcs_entry = NULL; interest_manifest_header_t *int_manifest_header = NULL; - int pos = 0; + unsigned long pos = 0; rt = vlib_node_get_runtime_data (vm, hicn_interest_pcslookup_node.index); diff --git a/lib/src/test/test_interest_manifest.cc b/lib/src/test/test_interest_manifest.cc index da7531fd3..25ac83728 100644 --- a/lib/src/test/test_interest_manifest.cc +++ b/lib/src/test/test_interest_manifest.cc @@ -152,7 +152,7 @@ TEST_F (InterestManifestTest, SerializeDeserialize) EXPECT_THAT (header->n_suffixes, ::testing::Eq (n_suffixes)); int i = 0; - int pos; + unsigned long pos; interest_manifest_foreach_suffix (header, suffix, pos) { if (pos == 0) @@ -169,7 +169,7 @@ TEST_F (InterestManifestTest, SerializeDeserialize) TEST_F (InterestManifestTest, ForEach) { - int pos; + unsigned long pos; hicn_name_suffix_t *suffix = nullptr; auto header = reinterpret_cast<interest_manifest_header_t *> (buffer); interest_manifest_init (header, 0); diff --git a/scripts/functions.sh b/scripts/functions.sh index e5484b02e..d6d8bf84e 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -81,13 +81,16 @@ function download_artifacts() { [[ -n ${GERRIT_PATCHSET_NUMBER:-} ]]; then # Retrieve the Jenkins URL of the build relative to this PATCHSET - JENKINS_URL=$( + JENKINS_URLS=$( curl -s "https://${GERRIT_HOST}/r/changes/${GERRIT_CHANGE_NUMBER}/detail" | tail -n +2 | jq '.messages[].message?' | grep -E "Patch Set ${GERRIT_PATCHSET_NUMBER}:.*hicn-verify-build.*build_success-hicn-ubuntu2004-$(uname -m)" | grep -Eo "https?://jenkins.fd.io/job/hicn-verify-build-hicn-ubuntu2004-$(uname -m)[^ ]+" ) - ARTIFACTS_URL="${JENKINS_URL}/artifact/packages/*zip*/packages.zip" + + # Transform string to array and get last + JENKINS_URLS_ARRAY=(${JENKINS_URLS}) + ARTIFACTS_URL="${JENKINS_URLS_ARRAY[-1]}/artifact/packages/*zip*/packages.zip" # Download artifacts curl -o "${SCRIPT_PATH}/../packages.zip" -L "${ARTIFACTS_URL}" |